Skip to content

Fix some incompatible pointer casts #734

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 24, 2025
Merged

Fix some incompatible pointer casts #734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/pcre2_compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10179,8 +10179,9 @@ pcre2_real_code *re = NULL; /* What we will return */
compile_block cb; /* "Static" compile-time data */
const uint8_t *tables; /* Char tables base pointer */

PCRE2_UCHAR null_str[1] = { 0xcd }; /* Dummy for handling null inputs */
PCRE2_UCHAR *code; /* Current pointer in compiled code */
PCRE2_UCHAR * codestart; /* Start of compiled code */
PCRE2_UCHAR *codestart; /* Start of compiled code */
PCRE2_SPTR ptr; /* Current pointer in pattern */
uint32_t *pptr; /* Current pointer in parsed pattern */

Expand Down Expand Up @@ -10235,7 +10236,9 @@ if (errorptr == NULL || erroroffset == NULL) return NULL;

if (pattern == NULL)
{
if (patlen == 0) pattern = (PCRE2_SPTR)""; else
if (patlen == 0)
pattern = null_str;
else
{
*errorptr = ERR16;
return NULL;
Expand Down
3 changes: 2 additions & 1 deletion src/pcre2_dfa_match.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3346,6 +3346,7 @@ int was_zero_terminated = 0;

const pcre2_real_code *re = (const pcre2_real_code *)code;

PCRE2_UCHAR null_str[1] = { 0xcd };
PCRE2_SPTR start_match;
PCRE2_SPTR end_subject;
PCRE2_SPTR bumpalong_limit;
Expand Down Expand Up @@ -3387,7 +3388,7 @@ rws->free = RWS_BASE_SIZE - RWS_ANCHOR_SIZE;

/* Recognize NULL, length 0 as an empty string. */

if (subject == NULL && length == 0) subject = (PCRE2_SPTR)"";
if (subject == NULL && length == 0) subject = null_str;

/* Plausibility checks */

Expand Down
3 changes: 2 additions & 1 deletion src/pcre2_match.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6939,6 +6939,7 @@ PCRE2_UCHAR first_cu2 = 0;
PCRE2_UCHAR req_cu = 0;
PCRE2_UCHAR req_cu2 = 0;

PCRE2_UCHAR null_str[1] = { 0xcd };
PCRE2_SPTR bumpalong_limit;
PCRE2_SPTR end_subject;
PCRE2_SPTR true_end_subject;
Expand Down Expand Up @@ -6977,7 +6978,7 @@ match_block *mb = &actual_match_block;

/* Recognize NULL, length 0 as an empty string. */

if (subject == NULL && length == 0) subject = (PCRE2_SPTR)"";
if (subject == NULL && length == 0) subject = null_str;

/* Plausibility checks */

Expand Down
5 changes: 3 additions & 2 deletions src/pcre2_substitute.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,6 +749,7 @@ BOOL use_existing_match;
BOOL replacement_only;
BOOL utf = (code->overall_options & PCRE2_UTF) != 0;
PCRE2_UCHAR temp[6];
PCRE2_UCHAR null_str[1] = { 0xcd };
PCRE2_SPTR ptr;
PCRE2_SPTR repend = NULL;
PCRE2_SIZE extra_needed = 0;
Expand Down Expand Up @@ -786,7 +787,7 @@ zero length is interpreted as an empty string. */
if (replacement == NULL)
{
if (rlength != 0) return PCRE2_ERROR_NULL;
replacement = (PCRE2_SPTR)"";
replacement = null_str;
}

if (rlength == PCRE2_ZERO_TERMINATED) rlength = PRIV(strlen)(replacement);
Expand Down Expand Up @@ -859,7 +860,7 @@ scb.ovector = ovector;
if (subject == NULL)
{
if (length != 0) return PCRE2_ERROR_NULL;
subject = (PCRE2_SPTR)"";
subject = null_str;
}

/* Find length of zero-terminated subject */
Expand Down