From: Ilia Alshanetsky <iliaa@php.net>
Date: Tue, 18 Jan 2005 16:32:53 +0000 (+0000)
Subject: Fixed bug #31480 (Possible infinite loop in imap_mail_compose()).
X-Git-Tag: RELEASE_0_2~262
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=023c1bccb3d7ccdbc8e670e392fa450866c35027;p=php

Fixed bug #31480 (Possible infinite loop in imap_mail_compose()).
---

diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index 1dbe3f46b4..8cf2f92b9c 100644
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -3089,7 +3089,7 @@ PHP_FUNCTION(imap_mail_compose)
 				bod->contents.text.size = Z_STRLEN_PP(pvalue);
 			} else {
 				bod->contents.text.data = (char *) fs_get(1);
-				bod->contents.text.data = "";
+				memcpy(bod->contents.text.data, "", 1);
 				bod->contents.text.size = 0;
 			}
 			if (zend_hash_find(Z_ARRVAL_PP(data), "lines", sizeof("lines"), (void **) &pvalue)== SUCCESS) {
@@ -3104,9 +3104,8 @@ PHP_FUNCTION(imap_mail_compose)
 				convert_to_string_ex(pvalue);
 				bod->md5 = cpystr(Z_STRVAL_PP(pvalue));
 			}
-
-			zend_hash_move_forward(Z_ARRVAL_PP(body));
 		}
+		zend_hash_move_forward(Z_ARRVAL_PP(body));
 	}
 
 	rfc822_encode_body_7bit(env, topbod);