clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.0'

Browse Source 
* PHP-8.0:
  Remove string length limit from levenshtein()
This commit is contained in:
Nikita Popov 2020-10-09 16:12:44 +02:00
commit 77d4fd437d
2 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ext/standard/levenshtein.c
View File

@ -17,8 +17,6 @@
#include "php.h"
#include "php_string.h"
#define LEVENSHTEIN_MAX_LENGTH 255
/* {{{ reference_levdist
* reference implementation, only optimized for memory usage, not speed */
static zend_long reference_levdist(const zend_string *string1, const zend_string *string2, zend_long cost_ins, zend_long cost_rep, zend_long cost_del )
@ -75,24 +73,12 @@ PHP_FUNCTION(levenshtein)
zend_long cost_ins = 1;
zend_long cost_rep = 1;
zend_long cost_del = 1;
zend_long distance = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "SS|lll", &string1, &string2, &cost_ins, &cost_rep, &cost_del) == FAILURE) {
RETURN_THROWS();
}
if (ZSTR_LEN(string1) > LEVENSHTEIN_MAX_LENGTH) {
zend_argument_value_error(1, "must be less than %d characters", LEVENSHTEIN_MAX_LENGTH + 1);
RETURN_THROWS();
}
if (ZSTR_LEN(string2) > LEVENSHTEIN_MAX_LENGTH) {
zend_argument_value_error(2, "must be less than %d characters", LEVENSHTEIN_MAX_LENGTH + 1);
RETURN_THROWS();
}
distance = reference_levdist(string1, string2, cost_ins, cost_rep, cost_del);
RETURN_LONG(distance);
RETURN_LONG(reference_levdist(string1, string2, cost_ins, cost_rep, cost_del));
}
/* }}} */

8
ext/standard/tests/strings/levenshtein_error_conditions.phpt
View File

@ -1,8 +1,10 @@
--TEST--
levenshtein() error conditions
levenshtein() former error conditions
--FILE--
<?php
// levenshtein no longer has a maximum string length limit.
echo '--- String 1 ---' . \PHP_EOL;
var_dump(levenshtein('AbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsu', 'A'));
try {
@ -25,7 +27,7 @@ try {
--EXPECT--
--- String 1 ---
int(254)
levenshtein(): Argument #1 ($string1) must be less than 256 characters
int(255)
--- String 2 ---
int(254)
levenshtein(): Argument #2 ($string2) must be less than 256 characters
int(255)