From: Pierre Joye <pajoye@php.net>
Date: Mon, 22 Jun 2009 14:09:55 +0000 (+0000)
Subject: - #48619, imap_search ALL segfaults
X-Git-Tag: php-5.3.0~84
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d1fb4d2da40eab39e72e616aeb6b6678f4cdc0a6;p=php

- #48619, imap_search ALL segfaults
---

diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index 7883c2e2c5..9e75da9d67 100644
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -3019,7 +3019,7 @@ PHP_FUNCTION(imap_sort)
 
 	slst = mail_sort(imap_le_struct->imap_stream, (argc == 6 ? charset : NIL), spg, mypgm, (argc >= 4 ? flags : NIL));
 
-	if (spg) {
+	if (spg && !(flags & SE_FREE)) {
 		mail_free_searchpgm(&spg);
 	}
 
@@ -3995,7 +3995,7 @@ PHP_FUNCTION(imap_search)
 
 	mail_search_full(imap_le_struct->imap_stream, (argc == 4 ? charset : NIL), pgm, flags);
 
-	if (pgm) {
+	if (pgm && !(flags & SE_FREE)) {
 		mail_free_searchpgm(&pgm);
 	}
 
@@ -4611,7 +4611,7 @@ PHP_FUNCTION(imap_thread)
 
 	pgm = mail_criteria(criteria);
 	top = mail_thread(imap_le_struct->imap_stream, "REFERENCES", NIL, pgm, flags);
-	if (pgm) {
+	if (pgm && !(flags & SE_FREE)) {
 		mail_free_searchpgm(&pgm);
 	}