summaryrefslogtreecommitdiff
path: root/lib/igt_core.c
diff options
context:
space:
mode:
authorPetri Latvala <petri.latvala@intel.com>2019-01-16 13:20:35 +0200
committerPetri Latvala <petri.latvala@intel.com>2019-01-21 13:49:11 +0200
commit009d7bd524aaa45e0910c3254b6ed47c0fc9e68c (patch)
treeebed63ee3aee94793605d1da306a46ef638be660 /lib/igt_core.c
parent8a048037fc938ead91807793f151fed54f1553dd (diff)
lib: Avoid memcpying 0 bytes from NULL
The behaviour of memcpying 0 bytes from NULL is semantically sound, but still undefined behaviour. Signed-off-by: Petri Latvala <petri.latvala@intel.com> Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com> Reviewed-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Diffstat (limited to 'lib/igt_core.c')
-rw-r--r--lib/igt_core.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/igt_core.c b/lib/igt_core.c
index 50d6008f..7c727edc 100644
--- a/lib/igt_core.c
+++ b/lib/igt_core.c
@@ -728,8 +728,9 @@ static int common_init(int *argc, char **argv,
all_opt_count += ARRAY_SIZE(long_options);
combined_opts = malloc(all_opt_count * sizeof(*combined_opts));
- memcpy(combined_opts, extra_long_opts,
- extra_opt_count * sizeof(*combined_opts));
+ if (extra_opt_count > 0)
+ memcpy(combined_opts, extra_long_opts,
+ extra_opt_count * sizeof(*combined_opts));
/* Copy the subtest long options (and the final NULL entry) */
memcpy(&combined_opts[extra_opt_count], long_options,