com php-src: Fixed bug #53070 (enchant_broker_get_path crashes if no path is set): NEWS ext/encha nt/enchant.c ext/enchant/tests/bug53070.phpt
| From: | Christoph Michael Becker | Date: | Sun, 15 Oct 2017 11:57:44 +0000 |
| Subject: | com php-src: Fixed bug #53070 (enchant_broker_get_path crashes if no path is set): NEWS ext/encha nt/enchant.c ext/enchant/tests/bug53070.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-99748@lists.php.net to get a copy of this message | ||
Commit: 5acb8381b22f4acf629d8fc89b4e0872f1a0825c
Author: Jelle van der Waa <jelle@vdwaa.nl> Mon, 9 Oct 2017 20:35:53 +0200
Committer: Christoph M. Becker <cmbecker69@gmx.de> Sun, 15 Oct 2017 13:57:44 +0200
Parents: fb0902143291c8b605997a6b2a8f8717289a44d1
Branches: PHP-7.0 PHP-7.1 PHP-7.2 master
Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=5acb8381b22f4acf629d8fc89b4e0872f1a0825c
Log:
Fixed bug #53070 (enchant_broker_get_path crashes if no path is set)
enchant_broker_get_dict_path segfaults when the dict path is not setup,
instead of segfaulting return false instead.
Bugs:
https://bugs.php.net/53070
Changed paths:
M NEWS
M ext/enchant/enchant.c
A ext/enchant/tests/bug53070.phpt
Diff:
diff --git a/NEWS b/NEWS
index 963b936..39eafaf 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,8 @@ PHP NEWS
function). (Laruence)
- Enchant:
+ . Fixed bug #53070 (enchant_broker_get_path crashes if no path is set). (jelle
+ van der Waa, cmb)
. Fixed bug #75365 (Enchant still reports version 1.1.0). (cmb)
- Exif:
diff --git a/ext/enchant/enchant.c b/ext/enchant/enchant.c
index 88993b3..cd376a1 100644
--- a/ext/enchant/enchant.c
+++ b/ext/enchant/enchant.c
@@ -482,6 +482,11 @@ PHP_FUNCTION(enchant_broker_get_dict_path)
RETURN_FALSE;
}
+ if (value == NULL) {
+ php_error_docref(NULL, E_WARNING, "dict_path not set");
+ RETURN_FALSE;
+ }
+
RETURN_STRING(value);
}
/* }}} */
diff --git a/ext/enchant/tests/bug53070.phpt b/ext/enchant/tests/bug53070.phpt
new file mode 100644
index 0000000..2183960
--- /dev/null
+++ b/ext/enchant/tests/bug53070.phpt
@@ -0,0 +1,20 @@
+--TEST--
+Bug #53070 (enchant_broker_get_path crashes if no path is set)
+--SKIPIF--
+<?php
+if(!extension_loaded('enchant')) die('skip, enchant not loader');
+if (!is_resource(enchant_broker_init())) {die("skip, resource dont load\n");}
+?>
+--FILE--
+<?php
+$broker = enchant_broker_init();
+var_dump(enchant_broker_get_dict_path($broker, ENCHANT_MYSPELL));
+var_dump(enchant_broker_get_dict_path($broker, ENCHANT_ISPELL));
+?>
+--EXPECTF--
+
+Warning: enchant_broker_get_dict_path(): dict_path not set in %s on line %d
+bool(false)
+
+Warning: enchant_broker_get_dict_path(): dict_path not set in %s on line %d
+bool(false)