Combine ideas

nielsdos · nielsdos · commit 47a5320d69d3 · 2025-06-10T22:15:31.000+02:00
Co-authored-by: divinity76@gmail.com
diff --git a/ext/standard/pack.c b/ext/standard/pack.c
@@ -77,17 +77,14 @@ typedef ZEND_SET_ALIGNED(1, int unaligned_int);
 /* {{{ php_pack */
 static void php_pack(const zval *val, size_t size, php_pack_endianness endianness, char *output)
 {
-	zend_long zl = zval_get_long(val);
+	zend_ulong zl = zval_get_long(val);
 
-	const char *v = (const char *) &zl;
 	if ((endianness == PHP_LITTLE_ENDIAN) != MACHINE_LITTLE_ENDIAN) {
 		zl = PHP_LONG_BSWAP(zl);
-		v += sizeof(zl) - size;
+		zl >>= (sizeof(zl) - size) * 8;
 	}
 
-	while (size-- > 0) {
-		*output++ = *v++;
-	}
+	memcpy(output, (const char *) &zl, size);
 }
 /* }}} */
 

Original file line number	Diff line number	Diff line change
`@@ -77,17 +77,14 @@ typedef ZEND_SET_ALIGNED(1, int unaligned_int);`
`77`	`77`	`/* {{{ php_pack */`
`78`	`78`	`static void php_pack(const zval val, size_t size, php_pack_endianness endianness, char output)`
`79`	`79`	`{`
`80`		`- zend_long zl = zval_get_long(val);`
	`80`	`+ zend_ulong zl = zval_get_long(val);`
`81`	`81`
`82`		`- const char v = (const char ) &zl;`
`83`	`82`	`if ((endianness == PHP_LITTLE_ENDIAN) != MACHINE_LITTLE_ENDIAN) {`
`84`	`83`	`zl = PHP_LONG_BSWAP(zl);`
`85`		`- v += sizeof(zl) - size;`
	`84`	`+ zl >>= (sizeof(zl) - size) * 8;`
`86`	`85`	`}`
`87`	`86`
`88`		`- while (size-- > 0) {`
`89`		`- output++ = v++;`
`90`		`- }`
	`87`	`+ memcpy(output, (const char *) &zl, size);`
`91`	`88`	`}`
`92`	`89`	`/* }}} */`
`93`	`90`