Skip to content

Commit f8e3970

Browse files
committed
Merge branch 'PHP-7.4'
* PHP-7.4: Fix checksum calculation for opcache
2 parents 4e563e6 + 042e3b2 commit f8e3970

File tree

4 files changed

+18
-11
lines changed

4 files changed

+18
-11
lines changed

NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ PHP NEWS
4040
- mysqlnd:
4141
. Fixed #60594 (mysqlnd exposes 160 lines of stats in phpinfo). (PeeHaa)
4242

43+
- OpCache:
44+
. Fixed bug #78654 (Incorrectly computed opcache checksum on files with
45+
non-ascii characters). (mhagstrand)
46+
4347
- PCRE:
4448
. Don't ignore invalid escape sequences. (sjon)
4549

ext/opcache/zend_accelerator_util_funcs.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -834,11 +834,11 @@ zend_op_array* zend_accel_load_script(zend_persistent_script *persistent_script,
834834
#define ADLER32_DO8(buf, i) ADLER32_DO4(buf, i); ADLER32_DO4(buf, i + 4);
835835
#define ADLER32_DO16(buf) ADLER32_DO8(buf, 0); ADLER32_DO8(buf, 8);
836836

837-
unsigned int zend_adler32(unsigned int checksum, signed char *buf, uint32_t len)
837+
unsigned int zend_adler32(unsigned int checksum, unsigned char *buf, uint32_t len)
838838
{
839839
unsigned int s1 = checksum & 0xffff;
840840
unsigned int s2 = (checksum >> 16) & 0xffff;
841-
signed char *end;
841+
unsigned char *end;
842842

843843
while (len >= ADLER32_NMAX) {
844844
len -= ADLER32_NMAX;
@@ -876,15 +876,15 @@ unsigned int zend_adler32(unsigned int checksum, signed char *buf, uint32_t len)
876876

877877
unsigned int zend_accel_script_checksum(zend_persistent_script *persistent_script)
878878
{
879-
signed char *mem = (signed char*)persistent_script->mem;
879+
unsigned char *mem = (unsigned char*)persistent_script->mem;
880880
size_t size = persistent_script->size;
881881
size_t persistent_script_check_block_size = ((char *)&(persistent_script->dynamic_members)) - (char *)persistent_script;
882882
unsigned int checksum = ADLER32_INIT;
883883

884-
if (mem < (signed char*)persistent_script) {
885-
checksum = zend_adler32(checksum, mem, (signed char*)persistent_script - mem);
886-
size -= (signed char*)persistent_script - mem;
887-
mem += (signed char*)persistent_script - mem;
884+
if (mem < (unsigned char*)persistent_script) {
885+
checksum = zend_adler32(checksum, mem, (unsigned char*)persistent_script - mem);
886+
size -= (unsigned char*)persistent_script - mem;
887+
mem += (unsigned char*)persistent_script - mem;
888888
}
889889

890890
zend_adler32(checksum, mem, persistent_script_check_block_size);

ext/opcache/zend_accelerator_util_funcs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ zend_op_array* zend_accel_load_script(zend_persistent_script *persistent_script,
3535

3636
#define ADLER32_INIT 1 /* initial Adler-32 value */
3737

38-
unsigned int zend_adler32(unsigned int checksum, signed char *buf, uint32_t len);
38+
unsigned int zend_adler32(unsigned int checksum, unsigned char *buf, uint32_t len);
3939

4040
unsigned int zend_accel_script_checksum(zend_persistent_script *persistent_script);
4141

ext/opcache/zend_file_cache.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -936,7 +936,7 @@ int zend_file_cache_script_store(zend_persistent_script *script, int in_shm)
936936
zend_shared_alloc_destroy_xlat_table();
937937

938938
info.checksum = zend_adler32(ADLER32_INIT, buf, script->size);
939-
info.checksum = zend_adler32(info.checksum, (signed char*)ZSTR_VAL((zend_string*)ZCG(mem)), info.str_size);
939+
info.checksum = zend_adler32(info.checksum, (unsigned char*)ZSTR_VAL((zend_string*)ZCG(mem)), info.str_size);
940940

941941
#if __has_feature(memory_sanitizer)
942942
/* The buffer may contain uninitialized regions. However, the uninitialized parts will not be
@@ -1511,6 +1511,7 @@ zend_persistent_script *zend_file_cache_script_load(zend_file_handle *file_handl
15111511
zend_accel_hash_entry *bucket;
15121512
void *mem, *checkpoint, *buf;
15131513
int cache_it = 1;
1514+
unsigned int actual_checksum;
15141515
int ok;
15151516

15161517
if (!full_path) {
@@ -1594,8 +1595,8 @@ zend_persistent_script *zend_file_cache_script_load(zend_file_handle *file_handl
15941595

15951596
/* verify checksum */
15961597
if (ZCG(accel_directives).file_cache_consistency_checks &&
1597-
zend_adler32(ADLER32_INIT, mem, info.mem_size + info.str_size) != info.checksum) {
1598-
zend_accel_error(ACCEL_LOG_WARNING, "corrupted file '%s'\n", filename);
1598+
(actual_checksum = zend_adler32(ADLER32_INIT, mem, info.mem_size + info.str_size)) != info.checksum) {
1599+
zend_accel_error(ACCEL_LOG_WARNING, "corrupted file '%s' excepted checksum: 0x%08x actual checksum: 0x%08x\n", filename, info.checksum, actual_checksum);
15991600
zend_file_cache_unlink(filename);
16001601
zend_arena_release(&CG(arena), checkpoint);
16011602
efree(filename);
@@ -1683,6 +1684,8 @@ zend_persistent_script *zend_file_cache_script_load(zend_file_handle *file_handl
16831684
zend_accel_hash_update(&ZCSG(hash), ZSTR_VAL(script->script.filename), ZSTR_LEN(script->script.filename), 0, script);
16841685

16851686
zend_shared_alloc_unlock();
1687+
zend_accel_error(ACCEL_LOG_INFO, "File cached script loaded into memory '%s'", ZSTR_VAL(script->script.filename));
1688+
16861689
zend_arena_release(&CG(arena), checkpoint);
16871690
}
16881691
efree(filename);

0 commit comments

Comments
 (0)