diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-12-01 09:04:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-01 09:04:38 -0800 |
| commit | 406ca29e0d660f8ba99a783cb207c53359f870cc (patch) | |
| tree | 14fe790358c23a3bfd2d7642f7fc13ec61413ee4 | |
| parent | Merge branch 'jt/fetch-remove-lazy-fetch-plugging' (diff) | |
| parent | parse-options: avoid arithmetic on pointer that's potentially NULL (diff) | |
| download | tgif-406ca29e0d660f8ba99a783cb207c53359f870cc.tar.xz | |
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
| -rw-r--r-- | parse-options-cb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/parse-options-cb.c b/parse-options-cb.c index 1240a8514e..c2062ae742 100644 --- a/parse-options-cb.c +++ b/parse-options-cb.c @@ -161,6 +161,7 @@ int parse_opt_tertiary(const struct option *opt, const char *arg, int unset) struct option *parse_options_dup(const struct option *o) { + const struct option *orig = o; struct option *opts; int nr = 0; @@ -170,7 +171,7 @@ struct option *parse_options_dup(const struct option *o) } 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; |