php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-07 16:13:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix #60192 SegFault when Collator not constructed properly

Browse Source
This commit is contained in:
Florian Anderiasch
2011-11-02 07:36:52 +00:00
parent b64e91ddeb
commit c2874a8077
8 changed files with 122 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ext/intl/collator/collator_compare.c
View File

@@ -99,6 +99,10 @@ PHP_FUNCTION( collator_compare )
RETURN_FALSE;
}
if (!co || !co->ucoll) {
php_error_docref(NULL TSRMLS_CC, E_ERROR, "Object not initialized");
}
/* Then compare them. */
result = ucol_strcoll(
co->ucoll,

4
ext/intl/collator/collator_locale.c
View File

@@ -51,6 +51,10 @@ PHP_FUNCTION( collator_get_locale )
/* Fetch the object. */
COLLATOR_METHOD_FETCH_OBJECT;
if (!co || !co->ucoll) {
php_error_docref(NULL TSRMLS_CC, E_ERROR, "Object not initialized");
}
/* Get locale by specified type. */
locale_name = (char*) ucol_getLocaleByType(
co->ucoll, type, COLLATOR_ERROR_CODE_P( co ) );

12
ext/intl/collator/collator_sort.c
View File

@@ -73,6 +73,10 @@ static int collator_regular_compare_function(zval *result, zval *op1, zval *op2
/* Fetch collator object. */
co = (Collator_object *) zend_object_store_get_object( INTL_G(current_collator) TSRMLS_CC );
if (!co || !co->ucoll) {
php_error_docref(NULL TSRMLS_CC, E_ERROR, "Object not initialized");
}
/* Compare the strings using ICU. */
result->value.lval = ucol_strcoll(
co->ucoll,
@@ -441,6 +445,10 @@ PHP_FUNCTION( collator_sort_with_sort_keys )
/* Get sort key, reallocating the buffer if needed. */
bufLeft = sortKeyBufSize - sortKeyBufOffset;
if (!co || !co->ucoll) {
php_error_docref(NULL TSRMLS_CC, E_ERROR, "Object not initialized");
}
sortKeyLen = ucol_getSortKey( co->ucoll,
utf16_buf,
utf16_len,
@@ -571,6 +579,10 @@ PHP_FUNCTION( collator_get_sort_key )
RETURN_FALSE;
}
if (!co || !co->ucoll) {
php_error_docref(NULL TSRMLS_CC, E_ERROR, "Object not initialized");
}
key_len = ucol_getSortKey(co->ucoll, ustr, ustr_len, key, 0);
if(!key_len) {
efree( ustr );

20
ext/intl/tests/bug60192-compare.phpt Normal file
View File

@@ -0,0 +1,20 @@
--TEST--
Bug #60192 (SegFault when Collator not constructed properly)
--SKIPIF--
<?php
if (!extension_loaded('intl')) { die('skip intl extension not available'); }
?>
--FILE--
<?php
class Collator2 extends Collator{
public function __construct() {
// ommitting parent::__construct($someLocale);
}
}
$c = new Collator2();
$c->compare('h', 'H');
--EXPECTF--
Fatal error: Collator::compare(): Object not initialized in %s on line %d

20
ext/intl/tests/bug60192-getlocale.phpt Normal file
View File

@@ -0,0 +1,20 @@
--TEST--
Bug #60192 (SegFault when Collator not constructed properly)
--SKIPIF--
<?php
if (!extension_loaded('intl')) { die('skip intl extension not available'); }
?>
--FILE--
<?php
class Collator2 extends Collator{
public function __construct() {
// ommitting parent::__construct($someLocale);
}
}
$c = new Collator2();
$c->getLocale(Locale::ACTUAL_LOCALE);
--EXPECTF--
Fatal error: Collator::getLocale(): Object not initialized in %s on line %d

20
ext/intl/tests/bug60192-getsortkey.phpt Normal file
View File

@@ -0,0 +1,20 @@
--TEST--
Bug #60192 (SegFault when Collator not constructed properly)
--SKIPIF--
<?php
if (!extension_loaded('intl')) { die('skip intl extension not available'); }
?>
--FILE--
<?php
class Collator2 extends Collator{
public function __construct() {
// ommitting parent::__construct($someLocale);
}
}
$c = new Collator2();
$c->getSortKey('h');
--EXPECTF--
Fatal error: Collator::getSortKey(): Object not initialized in %s on line %d

21
ext/intl/tests/bug60192-sort.phpt Normal file
View File

@@ -0,0 +1,21 @@
--TEST--
Bug #60192 (SegFault when Collator not constructed properly)
--SKIPIF--
<?php
if (!extension_loaded('intl')) { die('skip intl extension not available'); }
?>
--FILE--
<?php
class Collator2 extends Collator{
public function __construct() {
// ommitting parent::__construct($someLocale);
}
}
$c = new Collator2();
$a = array('a', 'b');
$c->sort($a);
--EXPECTF--
Fatal error: Collator::sort(): Object not initialized in %s on line %d

21
ext/intl/tests/bug60192-sortwithsortkeys.phpt Normal file
View File

@@ -0,0 +1,21 @@
--TEST--
Bug #60192 (SegFault when Collator not constructed properly)
--SKIPIF--
<?php
if (!extension_loaded('intl')) { die('skip intl extension not available'); }
?>
--FILE--
<?php
class Collator2 extends Collator{
public function __construct() {
// ommitting parent::__construct($someLocale);
}
}
$c = new Collator2();
$a = array('a', 'b');
$c->sortWithSortKeys($a);
--EXPECTF--
Fatal error: Collator::sortWithSortKeys(): Object not initialized in %s on line %d