From: Pierre Joye <pajoye@php.net>
Date: Thu, 30 Apr 2009 18:56:25 +0000 (+0000)
Subject: - MFB: #47940, memory leaks in imap_body
X-Git-Tag: php-5.3.0RC2~64
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8f9c7574c627d0caa5c189cd3113d8b21cb15530;p=php

- MFB: #47940, memory leaks in imap_body
---

diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index a71301e540..0114056c3a 100644
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -850,7 +850,7 @@ PHP_MINIT_FUNCTION(imap)
 	REGISTER_LONG_CONSTANT("NIL", NIL, CONST_PERSISTENT | CONST_CS);
 
 	/* plug in our gets */
-	mail_parameters(NIL, SET_GETS, (void *) php_mail_gets);
+	mail_parameters(NIL, SET_GETS, (void *) NULL);
 
 	/* set default timeout values */
 	mail_parameters(NIL, SET_OPENTIMEOUT, (void *) FG(default_socket_timeout));
@@ -2330,7 +2330,9 @@ PHP_FUNCTION(imap_savebody)
 	}
 
 	IMAPG(gets_stream) = writer;
+	mail_parameters(NIL, SET_GETS, (void *) php_mail_gets);
 	mail_fetchbody_full(imap_ptr->imap_stream, msgno, section, NULL, flags);
+	mail_parameters(NIL, SET_GETS, (void *) NULL);
 	IMAPG(gets_stream) = NULL;
 
 	if (close_stream) {