projects
/
m6w6
/
ext-http
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
| inline |
side by side
(parent:
7b028d0
)
fiy segv with null pointer string on flush
author
Michael Wallner
<mike@php.net>
Wed, 12 Dec 2012 11:42:34 +0000
(11:42 +0000)
committer
Michael Wallner
<mike@php.net>
Wed, 12 Dec 2012 11:42:34 +0000
(11:42 +0000)
php_http_encoding.c
patch
|
blob
|
history
diff --git
a/php_http_encoding.c
b/php_http_encoding.c
index 4a71c80074d24f1ea902a641df09810c13653312..a1667fc0fdc645be68540c69cf75fc670ccdb40e 100644
(file)
--- a/
php_http_encoding.c
+++ b/
php_http_encoding.c
@@
-1061,7
+1061,11
@@
PHP_METHOD(HttpEncodingStream, flush)
size_t encoded_len;
if (SUCCESS == php_http_encoding_stream_flush(obj->stream, &encoded_str, &encoded_len)) {
- RETURN_STRINGL(encoded_str, encoded_len, 0);
+ if (encoded_str) {
+ RETURN_STRINGL(encoded_str, encoded_len, 0);
+ } else {
+ RETURN_EMPTY_STRING();
+ }
}
}
}