diff options
| author | Felipe Pena <felipensp@gmail.com> | 2013-06-26 19:15:19 -0300 |
|---|---|---|
| committer | Felipe Pena <felipensp@gmail.com> | 2013-06-26 19:15:19 -0300 |
| commit | 60dcc5851f0dd7cf387270d6ba243f9ac46bc396 (patch) | |
| tree | 78ae5a9ff5b64cf35fa5d018c724133df01b377a /ext/imap/php_imap.c | |
| parent | 02682f4169f8f61f0f72e302b5d9271ba6491c36 (diff) | |
| download | php-git-60dcc5851f0dd7cf387270d6ba243f9ac46bc396.tar.gz | |
- Fixed bug #64467 (Segmentation fault after imap_reopen failure) patch by: askalski at gmail dot com
Diffstat (limited to 'ext/imap/php_imap.c')
| -rw-r--r-- | ext/imap/php_imap.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c index b154cb86b0..d697fa7911 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; } /* }}} */ |