diff options
| author | Antony Dovgal <tony2001@php.net> | 2009-01-19 09:52:24 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2009-01-19 09:52:24 +0000 |
| commit | 357ed77aeaeaf45885d372b061b67110fe04dc76 (patch) | |
| tree | 4778ba5bb71a91fe6895cb9cb2b10078c834d4fb | |
| parent | f42dfac501bb203c76b562cb0a137274af2cf2f8 (diff) | |
| download | php-git-357ed77aeaeaf45885d372b061b67110fe04dc76.tar.gz | |
MFH: fix memleaks in sscanf()
| -rw-r--r-- | ext/standard/scanf.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/standard/scanf.c b/ext/standard/scanf.c index 1d501d1a68..bb7e477ee5 100644 --- a/ext/standard/scanf.c +++ b/ext/standard/scanf.c @@ -934,7 +934,7 @@ literal: __buf[0] = sch; __buf[1] = '\0';; current = args[objIndex++]; - convert_to_string_ex( current ); + zval_dtor(*current); ZVAL_STRINGL( *current, __buf, 1, 1); } else { add_index_stringl(*return_value, objIndex++, &sch, 1, 1); @@ -1066,9 +1066,9 @@ addToInt: break; } else if (numVars) { /* change passed value type to string */ - current = args[objIndex++]; - convert_to_string( *current ); - ZVAL_STRING( *current, buf, 1 ); + current = args[objIndex++]; + zval_dtor(*current); + ZVAL_STRING( *current, buf, 1 ); } else { add_index_string(*return_value, objIndex++, buf, 1); } @@ -1077,7 +1077,7 @@ addToInt: break; } else if (numVars) { current = args[objIndex++]; - convert_to_long( *current ); + zval_dtor(*current); Z_LVAL(**current) = value; } else { add_index_long(*return_value, objIndex++, value); @@ -1182,7 +1182,7 @@ addToFloat: break; } else if (numVars) { current = args[objIndex++]; - convert_to_double( *current ); + zval_dtor(*current); Z_DVAL_PP( current ) = dvalue; } else { add_index_double( *return_value, objIndex++, dvalue ); |