Skip to content

Commit 5718d73

Browse files
committed
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6: Fix bug #77143 - add more checks to buffer reads
2 parents 66a0f06 + 48f0f73 commit 5718d73

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

ext/phar/phar.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -649,7 +649,7 @@ int phar_parse_metadata(char **buffer, zval *metadata, php_uint32 zip_metadata_l
649649
#define MANIFEST_FIXED_LEN 18
650650

651651
#define SAFE_PHAR_GET_32(buffer, endbuffer, var) \
652-
if (UNEXPECTED(buffer + 4 >= endbuffer)) { \
652+
if (UNEXPECTED(buffer + 4 > endbuffer)) { \
653653
MAPPHAR_FAIL("internal corruption of phar \"%s\" (truncated manifest header)"); \
654654
} \
655655
PHAR_GET_32(buffer, var);

0 commit comments

Comments
 (0)