[PHP-CVS] com php-src: fix using wrong buffer pointer: ext/openssl/openssl.c

2013-08-19 Thread Stanislav Malyshev
Commit:c1c49d6e3983c9ce0b43ffe7bf6e03b809ed048b
Author:Stanislav Malyshev  Mon, 19 Aug 2013 01:02:12 
-0700
Parents:   dcea4ec698dcae39b7bba6f6aa08933cbfee6755
Branches:  PHP-5.3 PHP-5.4 PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=c1c49d6e3983c9ce0b43ffe7bf6e03b809ed048b

Log:
fix using wrong buffer pointer

Changed paths:
  M  ext/openssl/openssl.c


Diff:
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index c7a9f5c..e7672e4 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -1502,6 +1502,7 @@ PHP_FUNCTION(openssl_x509_parse)
bio_out = BIO_new(BIO_s_mem());
if (nid == NID_subject_alt_name) {
if (openssl_x509v3_subjectAltName(bio_out, extension) 
== 0) {
+   BIO_get_mem_ptr(bio_out, &bio_buf);
add_assoc_stringl(subitem, extname, 
bio_buf->data, bio_buf->length, 1);
} else {
zval_dtor(return_value);


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] com php-src: fix using wrong buffer pointer: ext/openssl/openssl.c

2013-08-19 Thread Stanislav Malyshev
Commit:66606b8462e7daef68f5a21bdebe20f288dfd49f
Author:Stanislav Malyshev  Mon, 19 Aug 2013 01:02:12 
-0700
Parents:   0780256c196a8a32f104a804b2d6eb029ccafa6a
Branches:  PHP-5.4.19

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=66606b8462e7daef68f5a21bdebe20f288dfd49f

Log:
fix using wrong buffer pointer

Changed paths:
  M  ext/openssl/openssl.c


Diff:
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index c32748c..7070177 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -1574,6 +1574,7 @@ PHP_FUNCTION(openssl_x509_parse)
bio_out = BIO_new(BIO_s_mem());
if (nid == NID_subject_alt_name) {
if (openssl_x509v3_subjectAltName(bio_out, extension) 
== 0) {
+   BIO_get_mem_ptr(bio_out, &bio_buf);
add_assoc_stringl(subitem, extname, 
bio_buf->data, bio_buf->length, 1);
} else {
zval_dtor(return_value);


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] com php-src: fix using wrong buffer pointer: ext/openssl/openssl.c

2013-08-19 Thread Stanislav Malyshev
Commit:b7f033bd5de844e7cf0f1f7c2b884d582d4aa847
Author:Stanislav Malyshev  Mon, 19 Aug 2013 01:02:12 
-0700
Parents:   29b4532f618973b80b6b7017b44139995dce697c
Branches:  PHP-5.5.3

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=b7f033bd5de844e7cf0f1f7c2b884d582d4aa847

Log:
fix using wrong buffer pointer

Changed paths:
  M  ext/openssl/openssl.c


Diff:
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 4c3b2ec..98f3813 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -1587,6 +1587,7 @@ PHP_FUNCTION(openssl_x509_parse)
bio_out = BIO_new(BIO_s_mem());
if (nid == NID_subject_alt_name) {
if (openssl_x509v3_subjectAltName(bio_out, extension) 
== 0) {
+   BIO_get_mem_ptr(bio_out, &bio_buf);
add_assoc_stringl(subitem, extname, 
bio_buf->data, bio_buf->length, 1);
} else {
zval_dtor(return_value);


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php