gcc7: fix format truncation warning

detect-rpc.c: In function ‘DetectRpcParse’:
detect-rpc.c:225:50: error: ‘%s’ directive argument is null [-Werror=format-truncation=]
                 SCLogError(SC_ERR_INVALID_VALUE, "invalid rpc option %s",args[i]);
                                                  ^
util-debug.h:239:77: note: in definition of macro ‘SCLogErr’
             int _sc_log_ret = snprintf(_sc_log_msg, SC_LOG_MAX_LOG_MSG_LEN, __VA_ARGS__);   \
                                                                             ^~~~~~~~~~~
detect-rpc.c:225:17: note: in expansion of macro ‘SCLogError’
                 SCLogError(SC_ERR_INVALID_VALUE, "invalid rpc option %s",args[i]);
                 ^~~~~~~~~~
pull/2836/head
Victor Julien 8 years ago
parent 82e1af58cc
commit a73e84ea50

@ -190,7 +190,7 @@ DetectRpcData *DetectRpcParse (char *rpcstr)
rd->procedure = 0; rd->procedure = 0;
int i; int i;
for (i = 0; i < (ret -1); i++) { for (i = 0; i < (ret - 1); i++) {
if (args[i]) { if (args[i]) {
switch (i) { switch (i) {
case 0: case 0:
@ -199,7 +199,7 @@ DetectRpcData *DetectRpcParse (char *rpcstr)
goto error; goto error;
} }
rd->flags |= DETECT_RPC_CHECK_PROGRAM; rd->flags |= DETECT_RPC_CHECK_PROGRAM;
break; break;
case 1: case 1:
if (args[i][0] != '*') { if (args[i][0] != '*') {
if (ByteExtractStringUint32(&rd->program_version, 10, strlen(args[i]), args[i]) <= 0) { if (ByteExtractStringUint32(&rd->program_version, 10, strlen(args[i]), args[i]) <= 0) {
@ -208,7 +208,7 @@ DetectRpcData *DetectRpcParse (char *rpcstr)
} }
rd->flags |= DETECT_RPC_CHECK_VERSION; rd->flags |= DETECT_RPC_CHECK_VERSION;
} }
break; break;
case 2: case 2:
if (args[i][0] != '*') { if (args[i][0] != '*') {
if (ByteExtractStringUint32(&rd->procedure, 10, strlen(args[i]), args[i]) <= 0) { if (ByteExtractStringUint32(&rd->procedure, 10, strlen(args[i]), args[i]) <= 0) {
@ -218,11 +218,11 @@ DetectRpcData *DetectRpcParse (char *rpcstr)
rd->flags |= DETECT_RPC_CHECK_PROCEDURE; rd->flags |= DETECT_RPC_CHECK_PROCEDURE;
} }
break; break;
}
} else {
SCLogError(SC_ERR_INVALID_VALUE, "invalid rpc option %s",args[i]);
goto error;
} }
} else {
SCLogError(SC_ERR_INVALID_VALUE, "invalid rpc option %s",rpcstr);
goto error;
}
} }
for (i = 0; i < (ret -1); i++){ for (i = 0; i < (ret -1); i++){
if (args[i] != NULL) if (args[i] != NULL)

Loading…
Cancel
Save