Skip to content

Commit 6cc916e

Browse files
committed
fix buffer lengths and a test expectation
1 parent df2f12c commit 6cc916e

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

ext/sockets/sockets.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1781,7 +1781,7 @@ PHP_FUNCTION(socket_recvfrom)
17811781
if (tlayer < sizeof(*ip) || totalip < tlayer || totalip < slen) {
17821782
ZVAL_NULL(&zpayload);
17831783
zend_update_property(Z_OBJCE(obj), Z_OBJ(obj), ZEND_STRL("payload"), &zpayload);
1784-
zend_update_property_string(Z_OBJCE(obj), Z_OBJ(obj), ZEND_STRL("rawPacket"), ZSTR_VAL(recv_buf));
1784+
zend_update_property_stringl(Z_OBJCE(obj), Z_OBJ(obj), ZEND_STRL("rawPacket"), ZSTR_VAL(recv_buf), ZSTR_LEN(recv_buf));
17851785
zend_string_efree(dst_buf);
17861786
zend_string_efree(recv_buf);
17871787
ZEND_TRY_ASSIGN_REF_VALUE(arg2, &obj);
@@ -1836,7 +1836,7 @@ PHP_FUNCTION(socket_recvfrom)
18361836
}
18371837
default:
18381838
zend_update_property(Z_OBJCE(obj), Z_OBJ(obj), ZEND_STRL("payload"), &zpayload);
1839-
zend_update_property_string(Z_OBJCE(obj), Z_OBJ(obj), ZEND_STRL("rawPacket"), ZSTR_VAL(recv_buf));
1839+
zend_update_property_stringl(Z_OBJCE(obj), Z_OBJ(obj), ZEND_STRL("rawPacket"), ZSTR_VAL(recv_buf), ZSTR_LEN(recv_buf));
18401840
zend_string_efree(recv_buf);
18411841
zend_string_efree(dst_buf);
18421842
Z_DELREF(zpayload);
@@ -1923,7 +1923,7 @@ PHP_FUNCTION(socket_recvfrom)
19231923
// TODO IPPROTO_ICMPV6 support
19241924
default:
19251925
zend_update_property(Z_OBJCE(obj), Z_OBJ(obj), ZEND_STRL("payload"), &zpayload);
1926-
zend_update_property_string(Z_OBJCE(obj), Z_OBJ(obj), ZEND_STRL("rawPacket"), ZSTR_VAL(recv_buf));
1926+
zend_update_property_stringl(Z_OBJCE(obj), Z_OBJ(obj), ZEND_STRL("rawPacket"), ZSTR_VAL(recv_buf), ZSTR_LEN(recv_buf));
19271927
zend_string_efree(recv_buf);
19281928
zend_string_efree(dst_buf);
19291929
Z_DELREF(zpayload);
@@ -1993,7 +1993,7 @@ PHP_FUNCTION(socket_recvfrom)
19931993
zend_update_property_string(Z_OBJCE(obj), Z_OBJ(obj), ZEND_STRL("srcMac"), ether_ntoa((struct ether_addr *)e->h_source));
19941994
zend_update_property_string(Z_OBJCE(obj), Z_OBJ(obj), ZEND_STRL("dstMac"), ether_ntoa((struct ether_addr *)e->h_dest));
19951995
zend_update_property(Z_OBJCE(obj), Z_OBJ(obj), ZEND_STRL("payload"), &zpayload);
1996-
zend_update_property_string(Z_OBJCE(obj), Z_OBJ(obj), ZEND_STRL("rawPacket"), ZSTR_VAL(recv_buf));
1996+
zend_update_property_stringl(Z_OBJCE(obj), Z_OBJ(obj), ZEND_STRL("rawPacket"), ZSTR_VAL(recv_buf), ZSTR_LEN(recv_buf));
19971997
Z_DELREF(zpayload);
19981998
zend_string_efree(recv_buf);
19991999
zend_string_free(dst_buf);

ext/sockets/tests/socket_afpacket.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ object(Socket\EthernetPacket)#%d (7) {
362362
["headerSize"]=>
363363
int(40)
364364
["rawPacket"]=>
365-
string(%d) "%sunable to retrieve"
365+
string(%d) "%s"
366366
["srcAddr"]=>
367367
string(15) "%s.%s.%s.%s"
368368
["dstAddr"]=>

0 commit comments

Comments
 (0)