com php-src: fixed mem leak: ext/standard/string.c
| From: | Anatol Belski | Date: | Thu, 21 Aug 2014 10:18:08 +0000 |
| Subject: | com php-src: fixed mem leak: ext/standard/string.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-80710@lists.php.net to get a copy of this message | ||
Commit: 6bea54b7b9d5fff11bf40ab0464800baa9fbada3
Author: Anatol Belski <ab@php.net> Thu, 21 Aug 2014 12:18:08 +0200
Parents: 98bb620bfe132fbc3ee6c4e630e859ab6dc8ba78
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6bea54b7b9d5fff11bf40ab0464800baa9fbada3
Log:
fixed mem leak
Changed paths:
M ext/standard/string.c
Diff:
diff --git a/ext/standard/string.c b/ext/standard/string.c
index d104ac2..0ece8fb 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -5053,17 +5053,25 @@ PHP_FUNCTION(str_pad)
/* Helper variables */
size_t num_pad_chars; /* Number of padding characters (total - input size) */
- zend_string *pad_str; /* Pointer to padding string */
+ zend_string *pad_str, *pad_str_save; /* Pointer to padding string */
php_int_t pad_type_val = STR_PAD_RIGHT; /* The padding type value */
int i, left_pad=0, right_pad=0;
zend_string *result = NULL; /* Resulting string */
- pad_str = STR_INIT(" ", 1, 0);
+ pad_str = pad_str_save = STR_INIT(" ", 1, 1);
+ if (!pad_str) {
+ return;
+ }
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Si|Si", &input,
&pad_length, &pad_str, &pad_type_val) == FAILURE) {
+ STR_FREE(pad_str);
return;
}
+ if (pad_str != pad_str_save) {
+ STR_FREE(pad_str_save);
+ }
+
/* If resulting string turns out to be shorter than input string,
we simply copy the input and return. */
if (pad_length < 0 || pad_length <= input->len) {