Skip to content

Commit e21ffa1

Browse files
committed
detect-engine-address: initialize pointer in unit tests
To prevent the compiler warning about "c" being used uninitialized with LTO.
1 parent b539d4b commit e21ffa1

2 files changed

Lines changed: 11 additions & 13 deletions

File tree

src/detect-engine-address.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4339,7 +4339,7 @@ static int AddressTestCutIPv401(void)
43394339

43404340
static int AddressTestCutIPv402(void)
43414341
{
4342-
DetectAddress *a, *b, *c;
4342+
DetectAddress *a, *b, *c = NULL;
43434343
a = DetectAddressParseSingle("1.2.3.0/255.255.255.0");
43444344
b = DetectAddressParseSingle("1.2.2.0-1.2.3.4");
43454345

@@ -4363,7 +4363,7 @@ static int AddressTestCutIPv402(void)
43634363

43644364
static int AddressTestCutIPv403(void)
43654365
{
4366-
DetectAddress *a, *b, *c;
4366+
DetectAddress *a, *b, *c = NULL;
43674367
a = DetectAddressParseSingle("1.2.3.0/255.255.255.0");
43684368
b = DetectAddressParseSingle("1.2.2.0-1.2.3.4");
43694369

@@ -4394,7 +4394,7 @@ static int AddressTestCutIPv403(void)
43944394

43954395
static int AddressTestCutIPv404(void)
43964396
{
4397-
DetectAddress *a, *b, *c;
4397+
DetectAddress *a, *b, *c = NULL;
43984398
a = DetectAddressParseSingle("1.2.3.3-1.2.3.6");
43994399
b = DetectAddressParseSingle("1.2.3.0-1.2.3.5");
44004400

@@ -4426,7 +4426,7 @@ static int AddressTestCutIPv404(void)
44264426

44274427
static int AddressTestCutIPv405(void)
44284428
{
4429-
DetectAddress *a, *b, *c;
4429+
DetectAddress *a, *b, *c = NULL;
44304430
a = DetectAddressParseSingle("1.2.3.3-1.2.3.6");
44314431
b = DetectAddressParseSingle("1.2.3.0-1.2.3.9");
44324432

@@ -4457,7 +4457,7 @@ static int AddressTestCutIPv405(void)
44574457

44584458
static int AddressTestCutIPv406(void)
44594459
{
4460-
DetectAddress *a, *b, *c;
4460+
DetectAddress *a, *b, *c = NULL;
44614461
a = DetectAddressParseSingle("1.2.3.0-1.2.3.9");
44624462
b = DetectAddressParseSingle("1.2.3.3-1.2.3.6");
44634463

@@ -4488,7 +4488,7 @@ static int AddressTestCutIPv406(void)
44884488

44894489
static int AddressTestCutIPv407(void)
44904490
{
4491-
DetectAddress *a, *b, *c;
4491+
DetectAddress *a, *b, *c = NULL;
44924492
a = DetectAddressParseSingle("1.2.3.0-1.2.3.6");
44934493
b = DetectAddressParseSingle("1.2.3.0-1.2.3.9");
44944494

@@ -4517,7 +4517,7 @@ static int AddressTestCutIPv407(void)
45174517

45184518
static int AddressTestCutIPv408(void)
45194519
{
4520-
DetectAddress *a, *b, *c;
4520+
DetectAddress *a, *b, *c = NULL;
45214521
a = DetectAddressParseSingle("1.2.3.3-1.2.3.9");
45224522
b = DetectAddressParseSingle("1.2.3.0-1.2.3.9");
45234523

@@ -4546,7 +4546,7 @@ static int AddressTestCutIPv408(void)
45464546

45474547
static int AddressTestCutIPv409(void)
45484548
{
4549-
DetectAddress *a, *b, *c;
4549+
DetectAddress *a, *b, *c = NULL;
45504550
a = DetectAddressParseSingle("1.2.3.0-1.2.3.9");
45514551
b = DetectAddressParseSingle("1.2.3.0-1.2.3.6");
45524552

@@ -4575,7 +4575,7 @@ static int AddressTestCutIPv409(void)
45754575

45764576
static int AddressTestCutIPv410(void)
45774577
{
4578-
DetectAddress *a, *b, *c;
4578+
DetectAddress *a, *b, *c = NULL;
45794579
a = DetectAddressParseSingle("1.2.3.0-1.2.3.9");
45804580
b = DetectAddressParseSingle("1.2.3.3-1.2.3.9");
45814581

src/detect-fast-pattern.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -319,8 +319,7 @@ static int DetectFastPatternSetup(DetectEngineCtx *de_ctx, Signature *s, const c
319319
goto error;
320320
}
321321
uint16_t offset;
322-
if (StringParseUint16(&offset, 10, 0,
323-
(const char *)arg_substr) <= 0) {
322+
if (StringParseUint16(&offset, 10, 0, (const char *)arg_substr) <= 0) {
324323
SCLogError("Invalid fast pattern offset:"
325324
" \"%s\"",
326325
arg_substr);
@@ -335,8 +334,7 @@ static int DetectFastPatternSetup(DetectEngineCtx *de_ctx, Signature *s, const c
335334
goto error;
336335
}
337336
uint16_t length;
338-
if (StringParseUint16(&length, 10, 0,
339-
(const char *)arg_substr) <= 0) {
337+
if (StringParseUint16(&length, 10, 0, (const char *)arg_substr) <= 0) {
340338
SCLogError("Invalid value for fast "
341339
"pattern: \"%s\"",
342340
arg_substr);

0 commit comments

Comments
 (0)