php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-11 18:13:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add empty string checks to add?slashes

Browse Source
This commit is contained in:
Stanislav Malyshev
2000-09-17 09:15:48 +00:00
parent 2158bbfa7f
commit 27fb7df0d2
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ext/standard/string.c
View File

@@ -1737,6 +1737,15 @@ PHP_FUNCTION(addcslashes)
}
convert_to_string_ex(str);
convert_to_string_ex(what);
if(Z_STRLEN_PP(str) == 0) {
RETURN_EMPTY_STRING();
}
if(Z_STRLEN_PP(what) == 0) {
RETURN_STRINGL(Z_STRVAL_PP(str),Z_STRLEN_PP(str),1);
}
return_value->value.str.val = php_addcslashes((*str)->value.str.val,(*str)->value.str.len,&return_value->value.str.len,0,(*what)->value.str.val,(*what)->value.str.len);
return_value->type = IS_STRING;
}
@@ -1752,6 +1761,11 @@ PHP_FUNCTION(addslashes)
WRONG_PARAM_COUNT;
}
convert_to_string_ex(str);
if(Z_STRLEN_PP(str) == 0) {
RETURN_EMPTY_STRING();
}
return_value->value.str.val = php_addslashes((*str)->value.str.val,(*str)->value.str.len,&return_value->value.str.len,0);
return_value->type = IS_STRING;
}