clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

make sure all string from zlib are \0 terminated.

Browse Source 
change one realloc to erealloc (though this code is never reached IMHO)
add regression tests
This commit is contained in:
Thies C. Arntzen 2001-07-13 15:48:37 +00:00
parent 11eca11dca
commit d30590369a
4 changed files with 59 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ext/zlib/tests/001.phpt Normal file
View File

@ -0,0 +1,17 @@
--TEST--
gzdeflate()/gzinflate()
--SKIPIF--
<?php if (!extension_loaded("zlib")) print "skip"; ?>
--POST--
--GET--
--FILE--
<?php
$original = str_repeat("hallo php",4096);
$packed=gzdeflate($original);
echo strlen($packed)." ".strlen($original)."\n";
$unpacked=gzinflate($packed);
if (strcmp($original,$unpacked)==0) echo "Strings are equal";
?>
--EXPECT--
100 36864
Strings are equal

17
ext/zlib/tests/002.phpt Normal file
View File

@ -0,0 +1,17 @@
--TEST--
gzcompress()/gzuncompress()
--SKIPIF--
<?php if (!extension_loaded("zlib")) print "skip"; ?>
--POST--
--GET--
--FILE--
<?php
$original = str_repeat("hallo php",4096);
$packed=gzcompress($original);
echo strlen($packed)." ".strlen($original)."\n";
$unpacked=gzuncompress($packed);
if (strcmp($original,$unpacked)==0) echo "Strings are equal";
?>
--EXPECT--
106 36864
Strings are equal

16
ext/zlib/tests/003.phpt Normal file
View File

@ -0,0 +1,16 @@
--TEST--
gzdeflate()/gzinflate()
--SKIPIF--
<?php if (!extension_loaded("zlib")) print "skip"; ?>
--POST--
--GET--
--FILE--
<?php
$original = str_repeat("hallo php",4096);
$packed=gzencode($original);
echo strlen($packed)." ".strlen($original)."\n";
if (strcmp(base64_encode($packed),"H4sIAAAAAAAAA+zGoQ0AQAgEsFV+NdwJEthf/R6kVU11z9tsRERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERETu5gMAAP//AwDlQAe9AJAAAA==")==0) echo "Strings are equal";
?>
--EXPECT--
124 36864
Strings are equal

15
ext/zlib/zlib.c
View File

@ -760,7 +760,7 @@ PHP_FUNCTION(gzcompress)
}
convert_to_string_ex(data);
l2 = (*data)->value.str.len + ((*data)->value.str.len/1000) + 15;
l2 = (*data)->value.str.len + ((*data)->value.str.len/1000) + 15 + 1; /* room for \0 */
s2 = (char *) emalloc(l2);
if(! s2) RETURN_FALSE;
@ -770,7 +770,9 @@ PHP_FUNCTION(gzcompress)
status = compress(s2,&l2,(*data)->value.str.val, (*data)->value.str.len);
}
if(status==Z_OK) {
if (status==Z_OK) {
s2 = erealloc(s2,l2 + 1);
s2[l2] = '\0';
RETURN_STRINGL(s2, l2, 0);
} else {
efree(s2);
@ -785,7 +787,7 @@ PHP_FUNCTION(gzcompress)
PHP_FUNCTION(gzuncompress)
{
zval **data, **zlimit = NULL;
int status,factor=1,maxfactor=8;
int status,factor=1,maxfactor=16;
unsigned long plength=0,length;
char *s1=NULL,*s2=NULL;
@ -825,8 +827,9 @@ PHP_FUNCTION(gzuncompress)
s1=s2;
} while((status==Z_BUF_ERROR)&&(!plength)&&(factor<maxfactor));
if(status==Z_OK) {
s2 = erealloc(s2, length);
if (status==Z_OK) {
s2 = erealloc(s2, length + 1); /* space for \0 */
s2[ length ] = '\0';
RETURN_STRINGL(s2, length, 0);
} else {
efree(s2);
@ -1014,7 +1017,7 @@ static int php_do_deflate(uint str_length, Bytef **p_buffer, uint *p_buffer_len,
prev_outlen = outlen;
outlen *= 3;
if ((outlen+start_offset+end_offset) > *p_buffer_len) {
buffer = realloc(buffer, outlen+start_offset+end_offset);
buffer = erealloc(buffer, outlen+start_offset+end_offset);
}
ZLIBG(stream).next_out = buffer+start_offset + prev_outlen;