656046873c
Refactor mb_substr_count()
...
Promote empty needle warning to ValueError
Convert if branch into an assertion as if mbfl_substr_count fails this now implies a bug
Thus mb_substr_count() can only return int now, fix stubs accordingly
2020-04-02 22:40:00 +02:00
165fde9a37
Convert if branch to assertion in mb_strlen
...
This operation should never fail, therefore it's converted to an assertion.
Thus this mb_strlen() can now only return int, fix stubs accordingly
2020-04-02 22:40:00 +02:00
d44ee9112f
Promote mb_str_split warning to ValueError
...
Also add a TODO about documenting this funcion on PHP.net
Convert some checks to assertions as if they don't hold something went wrong during memory allocation
Due to these changes this function cannot return false anymore, fix stubs accordingly
2020-04-02 22:40:00 +02:00
f488b5d0f9
Merge mb_strstr() variants under a common implementation
...
This reduces heavy ducplicate code
2020-04-02 22:40:00 +02:00
737871341f
Improve code flow
...
These nested if-else blocks are unnecessary since we return early.
2020-04-02 22:40:00 +02:00
4cd3d7b166
Promote empty string warning to ValueError in mb_ord()
2020-04-02 22:39:59 +02:00
229dff9f08
Promote unsupported encoding warnings to ValueError
2020-04-01 00:54:36 +02:00
21227dc1f1
Use php_mb_get_encoding instead of mbfl_name2encoding to get encoding
...
This reduces the number of places where the error message template is used.
Also promote the mb_check_encoding() warning to ValueError and add a test to cover the behaviour.
2020-03-31 23:39:39 +02:00
11f0e1d1cb
Move encoding fetching out of php_mb_convert_encoding()
2020-03-31 21:47:55 +02:00
857fe616fa
Remove unnecesary check in php_mb_check_encoding()
...
The caller makes sure that this is not NULL.
2020-03-31 21:02:00 +02:00
90eeca2531
Convert some unknown encoding warnings to ValueErrors in ext/mbstring
...
Promotes only the warnings where the encoding comes only from a string.
Functions which accept an array of encodings will be fixed at a later stage.
Closes GH-5317
2020-03-31 16:34:18 +02:00
3ca08ee764
Make sure mbstring.internal_encoding deprecation is always thrown
...
It was not thrown if the setting was specified via -d at least.
2020-03-31 10:47:23 +02:00
8a2ce27bba
mb_detect_order(): Use proper array|string argument
2020-03-30 16:26:28 +02:00
500230fc85
Remove persistent arg from parse_encoding_array()
...
It is always zero.
2020-03-30 16:17:35 +02:00
b02b3539e7
mb_check_encoding(): Make var a proper array|string arg
2020-03-30 16:15:12 +02:00
50d07ff28c
mb_detect_encoding(): Use proper array|string parameter
...
Needed to add support for nullabiltiy in some places.
2020-03-30 16:15:12 +02:00
bb6523693c
mb_convert_variables(): Make $from an array|string argument
2020-03-30 15:51:04 +02:00
0d24422749
mb_convert_encoding(): Make $input a proper array|string arg
2020-03-30 15:41:55 +02:00
f24f6cbab9
mb_convert_encoding(): Make $from_encodings a proper array|string arg
...
Switching to FastZPP, as we don't support this in normal zpp.
2020-03-30 15:39:33 +02:00
7cea789cfc
Parse mb_convert_encoding() encodings only once
...
Instead of re-parsing them for every converted value. Also reuse
the generic parse_array() helper.
2020-03-30 14:54:15 +02:00
cd5a29b820
Properly report unknown encoding in encoding lists
...
And clean up the related array and list parsing code.
2020-03-30 14:46:59 +02:00
ed850f2723
Move encoding fetching outside php_mb_stripos()
2020-03-30 12:29:11 +02:00
2e97ae91c8
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Fix mb_ord() crash if internal encoding not supported
2020-01-29 16:19:21 +01:00
acc616c455
Merge branch 'PHP-7.3' into PHP-7.4
...
* PHP-7.3:
Fix mb_ord() crash if internal encoding not supported
2020-01-29 16:19:14 +01:00
a62c06c4cf
Fix mb_ord() crash if internal encoding not supported
...
enc_name can be NULL here. Take the name from the mbfl_encoding
instead.
2020-01-29 16:18:46 +01:00
083bbf5140
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Fix length inconsistency in mb_convert_encoding
2020-01-29 12:22:58 +01:00
5589bf4d4a
Fix length inconsistency in mb_convert_encoding
...
Don't mix strlen() and ZSTR_LEN(). If the encoding contains a
NULL byte, this will overflow the buffer.
NULL bytes will still make this behave oddly because the consuming
code will cut off the string there, but let's address that in master...
2020-01-29 12:19:28 +01:00
38d205a5b1
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Fix memory leak in mb_str_split
2020-01-28 17:40:07 +01:00
9fcaf25c93
Fix memory leak in mb_str_split
2020-01-28 17:39:49 +01:00
7db3a51884
Only fetch to_encoding once in mb_convert_encoding()
...
Instead of doing it on every conversion. This is both more efficient
and avoids generating multiple warnings.
2020-01-28 15:12:24 +01:00
ba82e18755
Allow empty needle in mb_strrchr()
2020-01-25 12:22:01 +01:00
986da2a436
Convert warnings to ValueError in mb_strpos function family.
...
Closes GH-5109
2020-01-24 23:59:22 +01:00
9e0e8d5650
Handle mb_str(r)ipos offset consistently as well
2020-01-24 10:54:20 +01:00
ce6169832f
Move offset error checking into mbfl_strpos
...
This avoids calculating the full length only in order to validate
the offset, as mbfl_strpos needs to find the offset internally
anyway.
2020-01-24 10:50:02 +01:00
0f6d223ddb
Add #defines for mbfl_strpos error conditions
2020-01-24 10:02:41 +01:00
f1bf4bf6eb
Don't leak encoding_str
2020-01-22 11:15:16 +01:00
9be31a582a
Fix #79154 : mb_convert_encoding() can modify $from_encoding
...
We must not modify arrays passed by value.
2020-01-22 10:28:07 +01:00
8f4d07bff0
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Fix #79149 : SEGV in mb_convert_encoding with non-string encodings
2020-01-22 09:45:37 +01:00
94c9dc498f
Fix #79149 : SEGV in mb_convert_encoding with non-string encodings
...
We must not assume that `hash_entry` `IS_STRING`, but rather use
`encoding_str` which is guaranteed to be.
2020-01-22 09:43:51 +01:00
483efc7e50
Allow empty needles in mb_strpos and mb_strstr function family.
...
MBstring analogous implementation to 6d578482a9
2020-01-07 22:53:35 +01:00
aadd3aaed9
Use RETURN_THROWS() in various places
2020-01-03 21:10:24 +01:00
7b4a4d2ace
Use RETURN_THROWS() after try_convert_to_string()
2020-01-03 17:04:06 +01:00
12ce73a5bb
Use RETURN_THROWS() after zend_value_error()
2019-12-31 16:58:15 +01:00
345703724c
Use RETURN_THROWS() during ZPP in most of the extensions
...
Except for some bigger ones: reflection, sodium, spl
2019-12-31 11:46:11 +01:00
2ab123b84e
Convert string|array union parameter types
...
Closes GH-4995
2019-12-20 10:15:52 +01:00
fdf45debdf
Remove deprecated behaviour of passing encoding as third parameter in mb_strrpos()
...
Merged GH-5011
2019-12-13 22:03:27 +01:00
e2100619ac
Expect appropriate parameter type in the first place
...
`mb_encode_numericentity()` and `mb_decode_numericentity()` accepted
arbitrary zvals as `$convmap`, but ignored anything else than arrays.
This appears to be an unresolved relict of their ZPP conversion for
PHP 5.3[1]. We now expect an array in the first place.
We also expect `count($convmap)` to be a multiple of four (else we
throw a `ValueError`), and do no longer special case empty `$convmap`.
[1] <http://git.php.net/?p=php-src.git;a=commit;h=1c77f594294aee9d60e7309279c616c01c39ba9d >
2019-10-07 16:48:08 +02:00
8f7238ed5c
Explicitly declare empty parameter list
2019-10-06 19:04:51 +02:00
0a47096c08
Add MBString arginfo stubs
2019-10-06 17:45:32 +02:00
21e631e473
Merge branch 'PHP-7.4'
2019-10-06 10:07:57 +02:00
George Peter Banyard