Skip to content

Commit f11f8eb

Browse files
committed
Revert accidental change for other PR
1 parent b7a2c69 commit f11f8eb

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

ext/phar/phar.c

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1149,9 +1149,15 @@ static zend_result phar_parse_pharfile(php_stream *fp, char *fname, size_t fname
11491149
PHAR_GET_32(buffer, entry.uncompressed_filesize);
11501150
PHAR_GET_32(buffer, entry.timestamp);
11511151

1152-
if (offset == halt_offset + manifest_len + 4
1153-
|| mydata->max_timestamp < entry.timestamp) {
1152+
if (offset == halt_offset + manifest_len + 4) {
1153+
mydata->min_timestamp = entry.timestamp;
11541154
mydata->max_timestamp = entry.timestamp;
1155+
} else {
1156+
if (mydata->min_timestamp > entry.timestamp) {
1157+
mydata->min_timestamp = entry.timestamp;
1158+
} else if (mydata->max_timestamp < entry.timestamp) {
1159+
mydata->max_timestamp = entry.timestamp;
1160+
}
11551161
}
11561162

11571163
PHAR_GET_32(buffer, entry.compressed_filesize);

ext/phar/phar_internal.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,7 @@ struct _phar_archive_data {
259259
/* hash of mounted directory paths */
260260
HashTable mounted_dirs;
261261
uint32_t flags;
262+
uint32_t min_timestamp;
262263
uint32_t max_timestamp;
263264
int refcount;
264265
php_stream *fp;

0 commit comments

Comments
 (0)