com php-src: Fixed #72857 stream_socket_recvfrom read a ccess violation: ext/standard/streamsfuncs.c ext/stan dard/tests/streams/bug72857.phpt
| From: | Anatol Belski | Date: | Tue, 16 Aug 2016 20:47:50 +0000 |
| Subject: | com php-src: Fixed #72857 stream_socket_recvfrom read a ccess violation: ext/standard/streamsfuncs.c ext/stan dard/tests/streams/bug72857.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-93804@lists.php.net to get a copy of this message | ||
Commit: 5391bb8be03c30cc742e67ce9f95b2767a40198d
Author: Anatol Belski <ab@php.net> Tue, 16 Aug 2016 22:47:50 +0200
Parents: e2230c17d3e17981c739cb858bc78d47d2365836
Branches: PHP-7.0 PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5391bb8be03c30cc742e67ce9f95b2767a40198d
Log:
Fixed #72857 stream_socket_recvfrom read access violation
Bugs:
https://bugs.php.net/72857
Changed paths:
M ext/standard/streamsfuncs.c
A ext/standard/tests/streams/bug72857.phpt
Diff:
diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c
index 971bfed..e39f9b4 100644
--- a/ext/standard/streamsfuncs.c
+++ b/ext/standard/streamsfuncs.c
@@ -394,7 +394,7 @@ PHP_FUNCTION(stream_socket_recvfrom)
);
if (recvd >= 0) {
- if (zremote) {
+ if (zremote && remote_addr) {
ZVAL_STR(zremote, remote_addr);
}
ZSTR_VAL(read_buf)[recvd] = '\0';
diff --git a/ext/standard/tests/streams/bug72857.phpt b/ext/standard/tests/streams/bug72857.phpt
new file mode 100644
index 0000000..2dc53dd
--- /dev/null
+++ b/ext/standard/tests/streams/bug72857.phpt
@@ -0,0 +1,16 @@
+--TEST--
+Bug #72857 stream_socket_recvfrom read access violation
+--FILE--
+<?php
+ $fp0 = fopen('stream_socket_recvfrom.tmp', 'w');
+ $v2=10;
+ $v3=STREAM_PEEK;
+ $v4="A";
+
+ var_dump(stream_socket_recvfrom($fp0,$v2,$v3,$v4), $v4);
+?>
+==DONE==
+--EXPECT--
+string(0) ""
+NULL
+==DONE==