commit 406ca29e0d660f8ba99a783cb207c53359f870cc
author Junio C Hamano <gitster@pobox.com> Sun Dec 01 09:04:38 2019 -0800
committer Junio C Hamano <gitster@pobox.com> Sun Dec 01 09:04:38 2019 -0800
tree 14fe790358c23a3bfd2d7642f7fc13ec61413ee4
parent fce9e836d395fb315bb8b77619868098a6cb02eb
parent 169bed7421b9c71870231e41ccb93a7abad3240e

Merge branch 'rs/parse-options-dup-null-fix'

Code cleanup.

* rs/parse-options-dup-null-fix:
  parse-options: avoid arithmetic on pointer that's potentially NULL

parse-options-cb.c

diff --git a/parse-options-cb.c b/parse-options-cb.c
index 1240a85..c2062ae 100644
--- a/parse-options-cb.c
+++ b/parse-options-cb.c
@@ -161,6 +161,7 @@
 
 struct option *parse_options_dup(const struct option *o)
 {
+	const struct option *orig = o;
 	struct option *opts;
 	int nr = 0;
 
@@ -170,7 +171,7 @@
 	}
 
 	ALLOC_ARRAY(opts, nr + 1);
-	memcpy(opts, o - nr, sizeof(*o) * nr);
+	COPY_ARRAY(opts, orig, nr);
 	memset(opts + nr, 0, sizeof(*opts));
 	opts[nr].type = OPTION_END;
 	return opts;