Skip to content

Commit 124fb22

Browse files
committed
Fixed bug #68739 #68740 #68741
1 parent a607a1d commit 124fb22

File tree

3 files changed

+8
-0
lines changed

3 files changed

+8
-0
lines changed

ext/curl/interface.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2721,6 +2721,7 @@ static int _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue) /* {{{
27212721
curl_easy_setopt(ch->cp, CURLOPT_SHARE, sh->share);
27222722
}
27232723
}
2724+
break;
27242725

27252726
#if LIBCURL_VERSION_NUM >= 0x071500 /* Available since 7.21.0 */
27262727
case CURLOPT_FNMATCH_FUNCTION:

ext/ereg/regex/regcomp.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1276,6 +1276,10 @@ int c;
12761276
register int ncols = (g->ncsets+(CHAR_BIT-1)) / CHAR_BIT;
12771277
register unsigned uc = (unsigned char)c;
12781278

1279+
if (!g->setbits) {
1280+
return(0);
1281+
}
1282+
12791283
for (i = 0, col = g->setbits; i < ncols; i++, col += g->csetsize)
12801284
if (col[uc] != 0)
12811285
return(1);

ext/pgsql/pgsql.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6445,6 +6445,9 @@ static inline void build_tablename(smart_str *querystr, PGconn *pg_link, const c
64456445
/* schame.table should be "schame"."table" */
64466446
table_copy = estrdup(table);
64476447
token = php_strtok_r(table_copy, ".", &tmp);
6448+
if (token == NULL) {
6449+
token = table;
6450+
}
64486451
len = strlen(token);
64496452
if (_php_pgsql_detect_identifier_escape(token, len) == SUCCESS) {
64506453
smart_str_appendl(querystr, token, len);

0 commit comments

Comments
 (0)