From: Felipe Pena <felipe@php.net>
Date: Mon, 25 Feb 2008 22:56:47 +0000 (+0000)
Subject: MFB: Fixed bug #44242 (metaphone('CMXFXM') crashes PHP)
X-Git-Tag: RELEASE_2_0_0a1~323
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cdb42ce6d288558fc984962a111659c9f8a59cfa;p=php

MFB: Fixed bug #44242 (metaphone('CMXFXM') crashes PHP)
---

diff --git a/ext/standard/metaphone.c b/ext/standard/metaphone.c
index deb1df8bac..37e11ed0d7 100644
--- a/ext/standard/metaphone.c
+++ b/ext/standard/metaphone.c
@@ -151,7 +151,12 @@ static char Lookahead(char *word, int how_far) /* {{{ */
 						(*phoned_word)[p_idx++] = c; \
 					}
 /* Slap a null character on the end of the phoned word */
-#define End_Phoned_Word	{(*phoned_word)[p_idx] = '\0';}
+#define End_Phoned_Word	{ \
+							if (p_idx == max_buffer_len) { \
+								*phoned_word = erealloc(*phoned_word, max_buffer_len + 1); \
+							} \
+							(*phoned_word)[p_idx] = '\0'; \
+						}
 /* How long is the phoned word? */
 #define Phone_Len	(p_idx)
 
diff --git a/ext/standard/tests/strings/bug44242.phpt b/ext/standard/tests/strings/bug44242.phpt
new file mode 100644
index 0000000000..00adda2be6
--- /dev/null
+++ b/ext/standard/tests/strings/bug44242.phpt
@@ -0,0 +1,14 @@
+--TEST--
+Bug #44242 (metaphone('CMXFXM') crashes PHP)
+--FILE--
+<?php
+
+echo metaphone('CMXFXZ'), "\n";
+echo metaphone('CMXFXV'), "\n";
+echo metaphone('CMXFXZXZ'), "\n";
+
+?>
+--EXPECT--
+KMKSFKSS
+KMKSFKSF
+KMKSFKSSKSS