Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
git2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
git2
Commits
d2f14df8
Commit
d2f14df8
authored
Jan 11, 2013
by
Sebastian Bauer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
regex: Fixed several warnings about signed/unsigned conversions.
parent
3a5e8fae
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
9 deletions
+11
-9
deps/regex/regcomp.c
+3
-2
deps/regex/regex_internal.h
+3
-2
deps/regex/regexec.c
+5
-5
No files found.
deps/regex/regcomp.c
View file @
d2f14df8
...
@@ -1140,7 +1140,7 @@ analyze (regex_t *preg)
...
@@ -1140,7 +1140,7 @@ analyze (regex_t *preg)
dfa
->
subexp_map
[
i
]
=
i
;
dfa
->
subexp_map
[
i
]
=
i
;
preorder
(
dfa
->
str_tree
,
optimize_subexps
,
dfa
);
preorder
(
dfa
->
str_tree
,
optimize_subexps
,
dfa
);
for
(
i
=
0
;
i
<
preg
->
re_nsub
;
i
++
)
for
(
i
=
0
;
i
<
preg
->
re_nsub
;
i
++
)
if
(
dfa
->
subexp_map
[
i
]
!=
i
)
if
(
dfa
->
subexp_map
[
i
]
!=
(
int
)
i
)
break
;
break
;
if
(
i
==
preg
->
re_nsub
)
if
(
i
==
preg
->
re_nsub
)
{
{
...
@@ -1609,7 +1609,8 @@ calc_inveclosure (re_dfa_t *dfa)
...
@@ -1609,7 +1609,8 @@ calc_inveclosure (re_dfa_t *dfa)
static
reg_errcode_t
static
reg_errcode_t
calc_eclosure
(
re_dfa_t
*
dfa
)
calc_eclosure
(
re_dfa_t
*
dfa
)
{
{
int
node_idx
,
incomplete
;
size_t
node_idx
;
int
incomplete
;
#ifdef DEBUG
#ifdef DEBUG
assert
(
dfa
->
nodes_len
>
0
);
assert
(
dfa
->
nodes_len
>
0
);
#endif
#endif
...
...
deps/regex/regex_internal.h
View file @
d2f14df8
...
@@ -171,8 +171,9 @@ extern const size_t __re_error_msgid_idx[] attribute_hidden;
...
@@ -171,8 +171,9 @@ extern const size_t __re_error_msgid_idx[] attribute_hidden;
typedef
unsigned
long
int
bitset_word_t
;
typedef
unsigned
long
int
bitset_word_t
;
/* All bits set in a bitset_word_t. */
/* All bits set in a bitset_word_t. */
#define BITSET_WORD_MAX ULONG_MAX
#define BITSET_WORD_MAX ULONG_MAX
/* Number of bits in a bitset_word_t. */
/* Number of bits in a bitset_word_t. Cast to int as most code use it
#define BITSET_WORD_BITS (sizeof (bitset_word_t) * CHAR_BIT)
* like that for counting */
#define BITSET_WORD_BITS ((int)(sizeof (bitset_word_t) * CHAR_BIT))
/* Number of bitset_word_t in a bit_set. */
/* Number of bitset_word_t in a bit_set. */
#define BITSET_WORDS (SBC_MAX / BITSET_WORD_BITS)
#define BITSET_WORDS (SBC_MAX / BITSET_WORD_BITS)
typedef
bitset_word_t
bitset_t
[
BITSET_WORDS
];
typedef
bitset_word_t
bitset_t
[
BITSET_WORDS
];
...
...
deps/regex/regexec.c
View file @
d2f14df8
...
@@ -689,7 +689,7 @@ re_search_internal (const regex_t *preg,
...
@@ -689,7 +689,7 @@ re_search_internal (const regex_t *preg,
if
(
nmatch
>
1
||
dfa
->
has_mb_node
)
if
(
nmatch
>
1
||
dfa
->
has_mb_node
)
{
{
/* Avoid overflow. */
/* Avoid overflow. */
if
(
BE
(
SIZE_MAX
/
sizeof
(
re_dfastate_t
*
)
<=
mctx
.
input
.
bufs_len
,
0
))
if
(
BE
(
SIZE_MAX
/
sizeof
(
re_dfastate_t
*
)
<=
(
size_t
)
mctx
.
input
.
bufs_len
,
0
))
{
{
err
=
REG_ESPACE
;
err
=
REG_ESPACE
;
goto
free_return
;
goto
free_return
;
...
@@ -920,7 +920,7 @@ re_search_internal (const regex_t *preg,
...
@@ -920,7 +920,7 @@ re_search_internal (const regex_t *preg,
if
(
dfa
->
subexp_map
)
if
(
dfa
->
subexp_map
)
for
(
reg_idx
=
0
;
reg_idx
+
1
<
nmatch
;
reg_idx
++
)
for
(
reg_idx
=
0
;
reg_idx
+
1
<
nmatch
;
reg_idx
++
)
if
(
dfa
->
subexp_map
[
reg_idx
]
!=
reg_idx
)
if
(
dfa
->
subexp_map
[
reg_idx
]
!=
(
int
)
reg_idx
)
{
{
pmatch
[
reg_idx
+
1
].
rm_so
pmatch
[
reg_idx
+
1
].
rm_so
=
pmatch
[
dfa
->
subexp_map
[
reg_idx
]
+
1
].
rm_so
;
=
pmatch
[
dfa
->
subexp_map
[
reg_idx
]
+
1
].
rm_so
;
...
@@ -953,7 +953,7 @@ prune_impossible_nodes (re_match_context_t *mctx)
...
@@ -953,7 +953,7 @@ prune_impossible_nodes (re_match_context_t *mctx)
halt_node
=
mctx
->
last_node
;
halt_node
=
mctx
->
last_node
;
/* Avoid overflow. */
/* Avoid overflow. */
if
(
BE
(
SIZE_MAX
/
sizeof
(
re_dfastate_t
*
)
<=
match_last
,
0
))
if
(
BE
(
SIZE_MAX
/
sizeof
(
re_dfastate_t
*
)
<=
(
size_t
)
match_last
,
0
))
return
REG_ESPACE
;
return
REG_ESPACE
;
sifted_states
=
re_malloc
(
re_dfastate_t
*
,
match_last
+
1
);
sifted_states
=
re_malloc
(
re_dfastate_t
*
,
match_last
+
1
);
...
@@ -3375,7 +3375,7 @@ build_trtable (const re_dfa_t *dfa, re_dfastate_t *state)
...
@@ -3375,7 +3375,7 @@ build_trtable (const re_dfa_t *dfa, re_dfastate_t *state)
/* Avoid arithmetic overflow in size calculation. */
/* Avoid arithmetic overflow in size calculation. */
if
(
BE
((((
SIZE_MAX
-
(
sizeof
(
re_node_set
)
+
sizeof
(
bitset_t
))
*
SBC_MAX
)
if
(
BE
((((
SIZE_MAX
-
(
sizeof
(
re_node_set
)
+
sizeof
(
bitset_t
))
*
SBC_MAX
)
/
(
3
*
sizeof
(
re_dfastate_t
*
)))
/
(
3
*
sizeof
(
re_dfastate_t
*
)))
<
ndests
),
<
(
size_t
)
ndests
),
0
))
0
))
goto
out_free
;
goto
out_free
;
...
@@ -4099,7 +4099,7 @@ extend_buffers (re_match_context_t *mctx)
...
@@ -4099,7 +4099,7 @@ extend_buffers (re_match_context_t *mctx)
re_string_t
*
pstr
=
&
mctx
->
input
;
re_string_t
*
pstr
=
&
mctx
->
input
;
/* Avoid overflow. */
/* Avoid overflow. */
if
(
BE
(
INT_MAX
/
2
/
sizeof
(
re_dfastate_t
*
)
<=
pstr
->
bufs_len
,
0
))
if
(
BE
(
INT_MAX
/
2
/
sizeof
(
re_dfastate_t
*
)
<=
(
size_t
)
pstr
->
bufs_len
,
0
))
return
REG_ESPACE
;
return
REG_ESPACE
;
/* Double the lengthes of the buffers. */
/* Double the lengthes of the buffers. */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment