cvs: php4 /ext/imap php_imap.c

sniper Sat Jan 6 23:47:48 2001 EDT Modified files: /php4/ext/imap php_imap.c Log: imap_user and imap_password were freed too early. PR: 8424 Index: php4/ext/imap/php_imap.c diff -u php4/ext/imap/php_imap.c:1.52 php4/ext/imap/php_imap.c:1.53 --- php4/ext/imap/php_imap.c:1.52 Fri Dec 22 04:57:06 2000 +++ php4/ext/imap/php_imap.c Sat Jan 6 23:47:46 2001 @@ -25,7 +25,7 @@ | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_imap.c,v 1.52 2000/12/22 12:57:06 zeev Exp $ */ +/* $Id: php_imap.c,v 1.53 2001/01/07 07:47:46 sniper Exp $ */ #define IMAP41 @@ -71,7 +71,7 @@ int imap_mail(char *to, char *subject, char *message, char *headers, char *cc, char *bcc, char *rpath); -void mail_close_it(zend_rsrc_list_entry *rsrc); +void mail_close_it (zend_rsrc_list_entry *rsrc); #ifdef OP_RELOGIN /* AJS: close persistent connection */ void mail_userlogout_it(zend_rsrc_list_entry *rsrc); @@ -184,6 +184,9 @@ { pils *imap_le_struct = (pils *)rsrc->ptr; mail_close_full(imap_le_struct->imap_stream, imap_le_struct->flags); + + efree(IMAPG(imap_user)); + efree(IMAPG(imap_password)); efree(imap_le_struct); } @@ -766,8 +769,6 @@ } else { #endif imap_stream = mail_open(NIL, Z_STRVAL_PP(mailbox), flags); - efree(IMAPG(imap_user)); - efree(IMAPG(imap_password)); if (imap_stream == NIL) { php_error(E_WARNING, "Couldn't open stream %s\n", (*mailbox)->value.str.val);