@@ -769,7 +769,7 @@ PHPAPI const MYSQLND_CHARSET * mysqlnd_find_charset_name(const char * const name
769
769
}
770
770
/* }}} */
771
771
772
- static zend_always_inline bool mysqlnd_validity_prerequisites_check (const MYSQLND_CHARSET * const cset , const zend_uchar * str )
772
+ static zend_always_inline bool mysqlnd_mb_validity_prerequisites_check (const MYSQLND_CHARSET * const cset , const zend_uchar * str )
773
773
{
774
774
/* Encodings that have a minimum length of 1 are compatible with ASCII.
775
775
* So we can skip (for performance reasons) the check to mb_valid for them. */
@@ -790,7 +790,7 @@ PHPAPI zend_ulong mysqlnd_cset_escape_quotes(const MYSQLND_CHARSET * const cset,
790
790
unsigned int len = 0 ;
791
791
/* check unicode characters */
792
792
793
- if (mysqlnd_validity_prerequisites_check (cset , (const zend_uchar * ) escapestr ) && (len = cset -> mb_valid (escapestr , end ))) {
793
+ if (mysqlnd_mb_validity_prerequisites_check (cset , (const zend_uchar * ) escapestr ) && (len = cset -> mb_valid (escapestr , end ))) {
794
794
ZEND_ASSERT (newstr + len <= newstr_e );
795
795
/* copy mb char without escaping it */
796
796
while (len -- ) {
@@ -830,7 +830,7 @@ PHPAPI zend_ulong mysqlnd_cset_escape_slashes(const MYSQLND_CHARSET * const cset
830
830
char esc = '\0' ;
831
831
832
832
/* check unicode characters */
833
- if (mysqlnd_validity_prerequisites_check (cset , (const zend_uchar * ) escapestr )) {
833
+ if (mysqlnd_mb_validity_prerequisites_check (cset , (const zend_uchar * ) escapestr )) {
834
834
unsigned int len = cset -> mb_valid (escapestr , end );
835
835
if (len ) {
836
836
ZEND_ASSERT (newstr + len <= newstr_e );
0 commit comments