Skip to content

Commit ce384f5

Browse files
committed
zlib: fix memory leak if deflate initialization fails and there is a dict
``` Direct leak of 52 byte(s) in 1 object(s) allocated from: #0 0x7ff90cd2c161 in malloc (/usr/lib/libasan.so.8+0x12c161) (BuildId: ee5fbab73143ab257a66a33afe0f038a4af7a74e) #1 0x55de10c9a468 in tracked_malloc /work/php-8.4/Zend/zend_alloc.c:2973 #2 0x55de10c99443 in _emalloc /work/php-8.4/Zend/zend_alloc.c:2740 #3 0x55de102deb86 in zlib_create_dictionary_string /work/php-8.4/ext/zlib/zlib.c:836 #4 0x55de102e145a in zif_deflate_init /work/php-8.4/ext/zlib/zlib.c:1144 #5 0x55de10dcac6c in ZEND_DO_ICALL_SPEC_RETVAL_USED_HANDLER /work/php-8.4/Zend/zend_vm_execute.h:1351 #6 0x55de10f2d69d in execute_ex /work/php-8.4/Zend/zend_vm_execute.h:58907 #7 0x55de10f41666 in zend_execute /work/php-8.4/Zend/zend_vm_execute.h:64334 #8 0x55de110a6cf8 in zend_execute_script /work/php-8.4/Zend/zend.c:1934 #9 0x55de10af0ddb in php_execute_script_ex /work/php-8.4/main/main.c:2577 #10 0x55de10af128f in php_execute_script /work/php-8.4/main/main.c:2617 #11 0x55de110ac5e1 in do_cli /work/php-8.4/sapi/cli/php_cli.c:935 #12 0x55de110ae592 in main /work/php-8.4/sapi/cli/php_cli.c:1322 #13 0x7ff90c027740 (/usr/lib/libc.so.6+0x27740) (BuildId: 020d6f7c33b2413f4fe10814c4729dce1387f049) #14 0x7ff90c027878 in __libc_start_main (/usr/lib/libc.so.6+0x27878) (BuildId: 020d6f7c33b2413f4fe10814c4729dce1387f049) #15 0x55de10005964 in _start (/work/php-8.4/sapi/cli/php+0x605964) (BuildId: 5f144db4e56ea623e070c56445fb1dfa3f8d085d) SUMMARY: AddressSanitizer: 52 byte(s) leaked in 1 allocation(s). ```
1 parent 8708c9d commit ce384f5

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

ext/zlib/zlib.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -908,6 +908,7 @@ PHP_FUNCTION(inflate_init)
908908
}
909909

910910
if (inflateInit2(&ctx->Z, encoding) != Z_OK) {
911+
efree(dict);
911912
zval_ptr_dtor(return_value);
912913
php_error_docref(NULL, E_WARNING, "Failed allocating zlib.inflate context");
913914
RETURN_FALSE;
@@ -1158,6 +1159,7 @@ PHP_FUNCTION(deflate_init)
11581159
}
11591160

11601161
if (deflateInit2(&ctx->Z, level, Z_DEFLATED, encoding, memory, strategy) != Z_OK) {
1162+
efree(dict);
11611163
zval_ptr_dtor(return_value);
11621164
php_error_docref(NULL, E_WARNING, "Failed allocating zlib.deflate context");
11631165
RETURN_FALSE;

0 commit comments

Comments
 (0)