Merge branch 'master' of https://git.php.net/push/php-src

* 'master' of https://git.php.net/push/php-src: (6215 commits)
  Extra comma
  Moved proxy object support in ASSIGN_ADD (and family) from VM to slow paths of corresponding operators
  Simplification
  zend_get_property_info_quick() cleanup and optimization
  initialize lineno before calling compile file file in phar
  Use ADDREF instead of DUP, it must be enough.
  Removed old irrelevant comment
  fixed compilation error
  Fix bug #68262: Broken reference across cloned objects
  export functions needed for phpdbg
  Fixed compilation
  Optimized property access handlers. Removed EG(std_property_info).
  Fixed bug #68199 (PDO::pgsqlGetNotify doesn't support NOTIFY payloads)
  Don't make difference between undefined and unaccessible properies when call __get() and family
  Don't make useless CSE
  array_pop/array_shift optimization
  check for zlib headers as well as lib for mysqlnd
  a realpath cache key can be int or float, catching this
  News entry for new curl constants
  News entry for new curl constants
  ...

1 files changed, 6 insertions, 13 deletions

diff --git a/ext/zip/lib/zip_source_pkware.c b/ext/zip/lib/zip_source_pkware.c
index 83b5cc5ad5..f6cbf1d2d5 100644
--- a/ext/zip/lib/zip_source_pkware.c
+++ b/ext/zip/lib/zip_source_pkware.c
@@ -49,10 +49,6 @@ struct trad_pkware {
 #define KEY1		591751049
 #define KEY2		878082192
 
-static const uLongf *crc = NULL;
-
-#define CRC32(c, b) (crc[((c) ^ (b)) & 0xff] ^ ((c) >> 8))
-
 
 
 static void decrypt(struct trad_pkware *, zip_uint8_t *,
@@ -64,7 +60,7 @@ static void pkware_free(struct trad_pkware *);
 
 
 
-ZIP_EXTERN(struct zip_source *)
+struct zip_source *
 zip_source_pkware(struct zip *za, struct zip_source *src,
 		  zip_uint16_t em, int flags, const char *password)
 {
@@ -80,9 +76,6 @@ zip_source_pkware(struct zip *za, struct zip_source *src,
 	return NULL;
     }
 
-    if (crc == NULL)
-	crc = get_crc_table();
-
     if ((ctx=(struct trad_pkware *)malloc(sizeof(*ctx))) == NULL) {
 	_zip_error_set(&za->error, ZIP_ER_MEMORY, 0);
 	return NULL;
@@ -118,7 +111,7 @@ decrypt(struct trad_pkware *ctx, zip_uint8_t *out, const zip_uint8_t *in,
 
 	if (!update_only) {
 	    /* decrypt next byte */
-	    tmp = ctx->key[2] | 2;
+	    tmp = (zip_uint16_t)(ctx->key[2] | 2);
 	    tmp = (tmp * (tmp ^ 1)) >> 8;
 	    b ^= tmp;
 	}
@@ -128,10 +121,10 @@ decrypt(struct trad_pkware *ctx, zip_uint8_t *out, const zip_uint8_t *in,
 	    out[i] = b;
 
 	/* update keys */
-	ctx->key[0] = CRC32(ctx->key[0], b);
+	ctx->key[0] = (zip_uint32_t)crc32(ctx->key[0] ^ 0xffffffffUL, &b, 1) ^ 0xffffffffUL;
 	ctx->key[1] = (ctx->key[1] + (ctx->key[0] & 0xff)) * 134775813 + 1;
 	b = ctx->key[1] >> 24;
-	ctx->key[2] = CRC32(ctx->key[2], b);
+	ctx->key[2] = (zip_uint32_t)crc32(ctx->key[2] ^ 0xffffffffUL, &b, 1) ^ 0xffffffffUL;
     }
 }
 
@@ -196,7 +189,7 @@ pkware_decrypt(struct zip_source *src, void *ud, void *data,
 	if ((n=zip_source_read(src, data, len)) < 0)
 	    return ZIP_SOURCE_ERR_LOWER;
 
-	decrypt(ud, (zip_uint8_t *)data, (zip_uint8_t *)data, (zip_uint64_t)n,
+	decrypt((struct trad_pkware *)ud, (zip_uint8_t *)data, (zip_uint8_t *)data, (zip_uint64_t)n,
 		0);
 	return n;
 
@@ -211,7 +204,7 @@ pkware_decrypt(struct zip_source *src, void *ud, void *data,
 
 	    st->encryption_method = ZIP_EM_NONE;
 	    st->valid |= ZIP_STAT_ENCRYPTION_METHOD;
-	    /* XXX: deduce HEADERLEN from size for uncompressed */
+	    /* TODO: deduce HEADERLEN from size for uncompressed */
 	    if (st->valid & ZIP_STAT_COMP_SIZE)
 		st->comp_size -= HEADERLEN;
 	}