From: Antony Dovgal <tony2001@php.net>
Date: Tue, 5 Sep 2006 10:35:53 +0000 (+0000)
Subject: fix segfaulting typo in dcngettext() =)
X-Git-Tag: RELEASE_1_0_0RC1~1775
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=13427fc603b4d6b83ba7002484aed77aaed4c7fa;p=php

fix segfaulting typo in dcngettext() =)
add new test
---

diff --git a/ext/gettext/gettext.c b/ext/gettext/gettext.c
index 8cd04c4bcd..79999e5890 100644
--- a/ext/gettext/gettext.c
+++ b/ext/gettext/gettext.c
@@ -327,7 +327,7 @@ PHP_NAMED_FUNCTION(zif_dcngettext)
 
 	RETVAL_FALSE;
 
-	if (ZEND_NUM_ARGS() != 5 || zend_get_parameters_ex(4, &domain, &msgid1, &msgid2, &count, &category) == FAILURE) {
+	if (ZEND_NUM_ARGS() != 5 || zend_get_parameters_ex(5, &domain, &msgid1, &msgid2, &count, &category) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	} else {
 		char* msgstr = NULL;
diff --git a/ext/gettext/tests/dcngettext.phpt b/ext/gettext/tests/dcngettext.phpt
new file mode 100644
index 0000000000..e5961eb1e9
--- /dev/null
+++ b/ext/gettext/tests/dcngettext.phpt
@@ -0,0 +1,30 @@
+--TEST--
+dcngettext() tests
+--SKIPIF--
+<?php 
+if (!extension_loaded("gettext")) die("skip"); 
+if (!function_exists("dcngettext")) die("skip dcngettext() doesn't exist");
+?>
+--FILE--
+<?php
+
+var_dump(dcngettext(1,1,1,1));
+var_dump(dcngettext(1,1,1,1,1));
+var_dump(dcngettext("test","test","test",1,1));
+var_dump(dcngettext("test","test","test",0,0));
+var_dump(dcngettext("test","test","test",-1,-1));
+var_dump(dcngettext("","","",1,1));
+var_dump(dcngettext("","","",0,0));
+
+echo "Done\n";
+?>
+--EXPECTF--	
+Warning: Wrong parameter count for dcngettext() in %s on line %d
+bool(false)
+string(1) "1"
+string(4) "test"
+string(4) "test"
+string(4) "test"
+string(0) ""
+string(0) ""
+Done