[dpdk-dev,4/5] examples: fix check for null before de-reference
Commit Message
The check for NULL is in the wrong position in the "if" error leg. The
pointer should be checked for NULL before checking what the value of
what the pointer points to is.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
examples/vm_power_manager/channel_manager.c | 2 +-
examples/vm_power_manager/vm_power_cli.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
@@ -389,7 +389,7 @@ add_all_channels(const char *vm_name)
errno = 0;
channel_num = (unsigned)strtol(remaining, &tail_ptr, 0);
if ((errno != 0) || (remaining[0] == '\0') ||
- (*tail_ptr != '\0') || tail_ptr == NULL) {
+ tail_ptr == NULL || (*tail_ptr != '\0')) {
RTE_LOG(WARNING, CHANNEL_MANAGER, "Malformed channel name"
"'%s' found it should be in the form of "
"'<guest_name>.<channel_num>(decimal)'\n",
@@ -323,7 +323,7 @@ cmd_channels_op_parsed(void *parsed_result, struct cmdline *cl,
break;
errno = 0;
channel_num = (unsigned)strtol(token, &tail_ptr, 10);
- if ((errno != 0) || (*tail_ptr != '\0') || tail_ptr == NULL)
+ if ((errno != 0) || tail_ptr == NULL || (*tail_ptr != '\0'))
break;
if (channel_num == CHANNEL_CMDS_MAX_VM_CHANNELS) {
@@ -408,7 +408,7 @@ cmd_channels_status_op_parsed(void *parsed_result, struct cmdline *cl,
break;
errno = 0;
channel_num = (unsigned)strtol(token, &tail_ptr, 10);
- if ((errno != 0) || (*tail_ptr != '\0') || tail_ptr == NULL)
+ if ((errno != 0) || tail_ptr == NULL || (*tail_ptr != '\0'))
break;
if (channel_num == CHANNEL_CMDS_MAX_VM_CHANNELS) {