Commit:    60dcc5851f0dd7cf387270d6ba243f9ac46bc396
Author:    Felipe Pena <felipe...@gmail.com>         Wed, 26 Jun 2013 19:15:19 
-0300
Parents:   02682f4169f8f61f0f72e302b5d9271ba6491c36
Branches:  PHP-5.4 PHP-5.5 master

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

Log:
- Fixed bug #64467 (Segmentation fault after imap_reopen failure) patch by: 
askalski at gmail dot com

Bugs:
https://bugs.php.net/64467

Changed paths:
  M  ext/imap/php_imap.c


Diff:
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index b154cb8..d697fa7 100644
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -1270,7 +1270,6 @@ PHP_FUNCTION(imap_reopen)
        int mailbox_len;
        long options = 0, retries = 0;
        pils *imap_le_struct;
-       MAILSTREAM *imap_stream;
        long flags=NIL;
        long cl_flags=NIL;
 
@@ -1298,12 +1297,12 @@ PHP_FUNCTION(imap_reopen)
                RETURN_FALSE;
        }
 
-       imap_stream = mail_open(imap_le_struct->imap_stream, mailbox, flags);
-       if (imap_stream == NIL) {
+       imap_le_struct->imap_stream = mail_open(imap_le_struct->imap_stream, 
mailbox, flags);
+       if (imap_le_struct->imap_stream == NIL) {
+               zend_list_delete(Z_RESVAL_P(streamind));
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't re-open 
stream");
                RETURN_FALSE;
        }
-       imap_le_struct->imap_stream = imap_stream;
        RETURN_TRUE;
 }
 /* }}} */


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

Reply via email to