Compile with `-Wwrite-strings`
cover Compile with `-Wwrite-strings`
Hi,
there were some recent discussions about compiler warnings and how to stay on top of breaking changes in compilers in general [1] and about string constants in particular [2]. This made me look into what kind of warnings we should reasonably enable, which led me to the following list of warnings that may be sensible:
- -Wformat-nonliteral to warn about non-constant strings being passed as format string.
- -Wwrite-strings to warn about string constants being assigned to a non-constant variable.
- -Wredundant-decls to warn about redundant declarations.
- -Wconversion to warn about implicit integer casts when they may alter the value.
This patch series adapts our code to compile with -Wwrite-strings. This option will change the type of string constants from char [] to const char [] such that it is now invalid to assign it to non-const variables without a cast. The intent is to avoid undefined behaviour when accedintally writing to such strings and to avoid free'ing such a variable.
There are quite some cases where we mishandle this. Oftentimes we just didn't bother to free any memory at all, which made it a non-issue in the first place. Other times we had some special logic that prevents writing or freeing such strings. But in most cases it was an accident waiting to happen.
Even though the changes are quite invasive, I think that this is a step into the right direction. Many of the constructs feel quite fragile, and most of those get fixed in this series. Some others I just paper over, for example when assigning to structures with global lifetime where we know that they are never released at all.
I also have a patch series cooking for -Wredundant-decls. But while that warning detects some redundant declarations indeed, it creates a problem with extern char **environ. There is no header for it and programs are asked to declare it by themselves. But of course, some libc implementations disagree and declare it. I haven't found a nice way to work around this issue, but may send the patches that drop the redundant declarations nonetheless.
The other two warnings I haven't yet looked into.
I ran some test jobs on both GitHub [3] and GitLab [4] to verify that the result is sane.
Thanks!
Patrick
[1]: <[email protected]>
[2]: <[email protected]> [3]: https://github.com/git/git/pull/1730
[4]: https://gitlab.com/gitlab-org/git/-/pipelines/1310156791
Patrick Steinhardt (19):
global: improve const correctness when assigning string constants
global: assign non-const strings as required
global: convert intentionally-leaking config strings to consts compat/win32: fix const-correctness with string constants
reftable: improve const correctness when assigning string constants
refspec: remove global tag refspec structure
http: do not assign string constant to non-const field
line-log: always allocate the output prefix
object-file: make buf parameter of index_mem() a constant
parse-options: cast long name for OPTION_ALIAS
send-pack: always allocate receive status
remote-curl: avoid assigning string constant to non-const variable
revision: always store allocated strings in output encoding
mailmap: always store allocated strings in mailmap blob
imap-send: drop global imap_server_conf variable
imap-send: fix leaking memory in imap_server_conf builtin/rebase: adapt code to not assign string constants to non-const builtin/merge: always store allocated strings in pull_twohead config.mak.dev: enable -Wwrite-strings warning
builtin/bisect.c | 3 +- builtin/blame.c | 2 +- builtin/bugreport.c | 2 +- builtin/check-ignore.c | 4 +- builtin/clone.c | 14 ++-- builtin/commit.c | 6 +- builtin/diagnose.c | 2 +- builtin/fetch.c | 11 ++- builtin/log.c | 2 +- builtin/mailsplit.c | 4 +- builtin/merge.c | 18 +++-- builtin/pull.c | 52 +++++++------- builtin/rebase.c | 16 +++-- builtin/receive-pack.c | 4 +- builtin/remote.c | 3 +- builtin/revert.c | 2 +- builtin/send-pack.c | 2 + compat/basename.c | 15 +++- compat/mingw.c | 25 +++---- compat/regex/regcomp.c | 2 +- compat/winansi.c | 2 +- config.mak.dev | 1 + diff.c | 7 +- diffcore-rename.c | 6 +- entry.c | 7 +- fmt-merge-msg.c | 2 +- fsck.c | 2 +- fsck.h | 2 +- gpg-interface.c | 6 +- http-backend.c | 2 +- http.c | 5 +- ident.c | 9 ++- imap-send.c | 133 ++++++++++++++++++++--------------- line-log.c | 21 +++--- mailmap.c | 2 +- merge-ll.c | 11 ++- object-file.c | 17 ++--- parse-options.h | 2 +- pretty.c | 7 +- refs.c | 2 +- refs.h | 2 +- refs/reftable-backend.c | 5 +- refspec.c | 13 ---- refspec.h | 1 - reftable/basics_test.c | 4 +- reftable/block_test.c | 2 +- reftable/merged_test.c | 45 ++++++------ reftable/readwrite_test.c | 47 +++++++------ reftable/record.c | 6 +- reftable/stack_test.c | 65 ++++++++--------- remote-curl.c | 58 ++++++++------- revision.c | 3 +- run-command.c | 2 +- send-pack.c | 2 +- t/helper/test-hashmap.c | 3 +- t/helper/test-json-writer.c | 10 +-- t/helper/test-regex.c | 4 +- t/helper/test-rot13-filter.c | 5 +- t/t3900-i18n-commit.sh | 1 + t/t3901-i18n-patch.sh | 1 + t/unit-tests/t-strbuf.c | 10 +-- trailer.c | 2 +- userdiff.c | 10 +-- userdiff.h | 12 ++-- wt-status.c | 2 +- 65 files changed, 410 insertions(+), 340 deletions(-)
Signature · 1 line
2.45.1.313.g3a57aa566a.dirty
PATCH 1/19 global: improve const correctness when assigning string constants
We're about to enable -Wwrite-strings, which changes the type of string constants to const char[]. Fix various sites where we assign such constants to non-const variables.
--- builtin/bisect.c | 3 ++- builtin/blame.c | 2 +- builtin/bugreport.c | 2 +- builtin/check-ignore.c | 4 +-- builtin/clone.c | 6 ++--- builtin/commit.c | 6 ++--- builtin/diagnose.c | 2 +- builtin/log.c | 2 +- builtin/mailsplit.c | 4 +-- builtin/pull.c | 52 ++++++++++++++++++------------------ builtin/receive-pack.c | 4 +-- builtin/revert.c | 2 +- compat/regex/regcomp.c | 2 +- diff.c | 4 +-- diffcore-rename.c | 6 ++--- fmt-merge-msg.c | 2 +- fsck.c | 2 +- fsck.h | 2 +- gpg-interface.c | 2 +- http-backend.c | 2 +- imap-send.c | 6 ++--- pretty.c | 2 +- refs.c | 2 +- refs.h | 2 +- reftable/record.c | 6 ++--- run-command.c | 2 +- t/helper/test-hashmap.c | 3 ++- t/helper/test-json-writer.c | 10 +++---- t/helper/test-regex.c | 4 +-- t/helper/test-rot13-filter.c | 5 ++-- t/unit-tests/t-strbuf.c | 10 ++++--- trailer.c | 2 +- wt-status.c | 2 +- 33 files changed, 86 insertions(+), 81 deletions(-)
builtin/bisect.c +2 -1
@@ -262,7 +262,8 @@ static int bisect_reset(const char *commit)return bisect_clean_state (); } -static void log_commit (FILE *fp,char *fmt,const char *state, +static void log_commit (FILE *fp, +const char *fmt,const char *state,struct commit *commit) {struct pretty_print_context pp = {0 };
builtin/blame.c +1 -1
@@ -134,7 +134,7 @@ static void get_ac_line(const char *inbuf, const char *what, {struct ident_split ident;size_t len, maillen, namelen; -char *tmp, *endp; +const char *tmp, *endp;const char *namebuf, *mailbuf; tmp =strstr (inbuf, what);
builtin/bugreport.c +1 -1
@@ -107,7 +107,7 @@ int cmd_bugreport(int argc, const char **argv, const char *prefix)struct tm tm;enum diagnose_mode diagnose =DIAGNOSE_NONE ;char *option_output =NULL ; -char *option_suffix ="%Y-%m-%d-%H%M" ; +const char *option_suffix ="%Y-%m-%d-%H%M" ;const char *user_relative_path =NULL ;char *prefixed_filename;size_t output_path_len;
builtin/check-ignore.c +2 -2
@@ -35,8 +35,8 @@ static const struct option check_ignore_options[] = {static void output_pattern (const char *path,struct path_pattern *pattern) { -char *bang = (pattern && pattern->flags &PATTERN_FLAG_NEGATIVE ) ?"!" :"" ; -char *slash = (pattern && pattern->flags &PATTERN_FLAG_MUSTBEDIR ) ?"/" :"" ; +const char *bang = (pattern && pattern->flags &PATTERN_FLAG_NEGATIVE ) ?"!" :"" ; +const char *slash = (pattern && pattern->flags &PATTERN_FLAG_MUSTBEDIR ) ?"/" :"" ;if (!nul_term_line) {if (!verbose) {write_name_quoted (path, stdout,'\n' );
builtin/clone.c +3 -3
@@ -71,7 +71,7 @@ static char *option_branch = NULL;static struct string_list option_not =STRING_LIST_INIT_NODUP ;static const char *real_git_dir;static const char *ref_format; -static char *option_upload_pack ="git-upload-pack" ; +static const char *option_upload_pack ="git-upload-pack" ;static int option_verbosity;static int option_progress =-1 ;static int option_sparse_checkout;
@@ -177,8 +177,8 @@ static struct option builtin_clone_options[] = {static const char *get_repo_path_1 (struct strbuf *path,int *is_bundle) { -static char *suffix[] = {"/.git" ,"" ,".git/.git" ,".git" }; -static char *bundle_suffix[] = {".bundle" ,"" }; +static const char *suffix[] = {"/.git" ,"" ,".git/.git" ,".git" }; +static const char *bundle_suffix[] = {".bundle" ,"" };size_t baselen = path->len;struct stat st;int i;
builtin/commit.c +3 -3
@@ -113,7 +113,7 @@ static char *template_file;* the commit message and/or authorship. */ static const char *author_message, *author_message_buffer; -static char *edit_message, *use_message; +static const char *edit_message, *use_message;static char *fixup_message, *fixup_commit, *squash_message;static const char *fixup_prefix;static int all, also, interactive, patch_interactive, only, amend, signoff;
@@ -121,8 +121,8 @@ static int edit_flag = -1; /* unspecified */static int quiet, verbose, no_verify, allow_empty, dry_run, renew_authorship;static int config_commit_verbose =-1 ;/* unspecified */ static int no_post_rewrite, allow_empty_message, pathspec_file_nul; -static char *untracked_files_arg, *force_date, *ignore_submodule_arg, *ignored_arg; -static char *sign_commit, *pathspec_from_file; +static const char *untracked_files_arg, *force_date, *ignore_submodule_arg, *ignored_arg; +static const char *sign_commit, *pathspec_from_file;static struct strvec trailer_args =STRVEC_INIT ;/*
builtin/diagnose.c +1 -1
@@ -18,7 +18,7 @@ int cmd_diagnose(int argc, const char **argv, const char *prefix)struct tm tm;enum diagnose_mode mode =DIAGNOSE_STATS ;char *option_output =NULL ; -char *option_suffix ="%Y-%m-%d-%H%M" ; +const char *option_suffix ="%Y-%m-%d-%H%M" ;char *prefixed_filename;const struct option diagnose_options[] = {
builtin/log.c +1 -1
@@ -1283,7 +1283,7 @@ static void get_patch_ids(struct rev_info *rev, struct patch_ids *ids) o2->flags = flags2; } -static void gen_message_id (struct rev_info *info,char *base) +static void gen_message_id (struct rev_info *info,const char *base) {struct strbuf buf =STRBUF_INIT ; strbuf_addf(&buf, "%s.%"PRItime".git.%s", base,
builtin/mailsplit.c +2 -2
@@ -113,8 +113,8 @@ static int populate_maildir_list(struct string_list *list, const char *path)DIR *dir;struct dirent *dent;char *name =NULL ; -char *subs[] = {"cur" ,"new" ,NULL }; -char **sub; +const char *subs[] = {"cur" ,"new" ,NULL }; +const char **sub;int ret =-1 ;for (sub = subs; *sub; ++sub) {
builtin/pull.c +26 -26
74 lines not on this page · raw message
builtin/receive-pack.c +2 -2
@@ -1249,7 +1249,7 @@ static int run_proc_receive_hook(struct command *commands,return code; } -static char *refuse_unconfigured_deny_msg = +static const char *refuse_unconfigured_deny_msg =N_ ("By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" "with what you pushed, and will require 'git reset --hard' to match\n"
@@ -1269,7 +1269,7 @@ static void refuse_unconfigured_deny(void)rp_error ("%s" ,_ (refuse_unconfigured_deny_msg)); } -static char *refuse_unconfigured_deny_delete_current_msg = +static const char *refuse_unconfigured_deny_delete_current_msg =N_ ("By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" "\n"
builtin/revert.c +1 -1
@@ -179,7 +179,7 @@ static int run_sequencer(int argc, const char **argv, const char *prefix,/* Check for incompatible command line arguments */ if (cmd) { -char *this_operation; +const char *this_operation;if (cmd =='q' ) this_operation ="--quit" ;else if (cmd =='c' )
compat/regex/regcomp.c +1 -1
@@ -848,7 +848,7 @@ init_dfa (re_dfa_t *dfa, size_t pat_len) {unsigned int table_size;#ifndef _LIBC -char *codeset_name; +const char *codeset_name;#endif memset (dfa,'\0' ,sizeof (re_dfa_t));
diff.c +2 -2
@@ -3764,7 +3764,7 @@ static void builtin_diff(const char *name_a,return ; } -static char *get_compact_summary (const struct diff_filepair *p,int is_renamed) +static const char *get_compact_summary (const struct diff_filepair *p,int is_renamed) {if (!is_renamed) {if (p->status ==DIFF_STATUS_ADDED ) {
@@ -4076,7 +4076,7 @@ static int reuse_worktree_file(struct index_state *istate,static int diff_populate_gitlink (struct diff_filespec *s,int size_only) {struct strbuf buf =STRBUF_INIT ; -char *dirty ="" ; +const char *dirty ="" ;/* Are we looking at the work tree? */ if (s->dirty_submodule)
diffcore-rename.c +3 -3
@@ -406,7 +406,7 @@ static const char *get_highest_rename_path(struct strintmap *counts)return highest_destination_dir; } -static char *UNKNOWN_DIR ="/" ;/* placeholder -- short, illegal directory */ +static const char *UNKNOWN_DIR ="/" ;/* placeholder -- short, illegal directory */ static int dir_rename_already_determinable (struct strintmap *counts) {
@@ -429,8 +429,8 @@ static int dir_rename_already_determinable(struct strintmap *counts) }static void increment_count (struct dir_rename_info *info, -char *old_dir, -char *new_dir) +const char *old_dir, +const char *new_dir) {struct strintmap *counts;struct strmap_entry *e;
fmt-merge-msg.c +1 -1
@@ -447,7 +447,7 @@ static void fmt_merge_msg_title(struct strbuf *out, const char *current_branch) {int i =0 ; -char *sep ="" ; +const char *sep ="" ;strbuf_addstr (out,"Merge " );for (i =0 ; i < srcs.nr; i++) {
fsck.c +1 -1
@@ -1231,7 +1231,7 @@ int fsck_object(struct object *obj, void *data, unsigned long size, }int fsck_buffer (const struct object_id *oid,enum object_type type, -void *data,unsigned long size, +const void *data,unsigned long size,struct fsck_options *options) {if (type ==OBJ_BLOB )
fsck.h +1 -1
@@ -202,7 +202,7 @@ int fsck_object(struct object *obj, void *data, unsigned long size,* struct. */ int fsck_buffer (const struct object_id *oid,enum object_type , -void *data,unsigned long size, +const void *data,unsigned long size,struct fsck_options *options);/*
gpg-interface.c +1 -1
@@ -727,7 +727,7 @@ static int git_gpg_config(const char *var, const char *value, void *cb UNUSED) {struct gpg_format *fmt =NULL ; -char *fmtname =NULL ; +const char *fmtname =NULL ;char *trust;int ret;
http-backend.c +1 -1
@@ -753,7 +753,7 @@ static int bad_request(struct strbuf *hdr, const struct service_cmd *c) int cmd_main(int argc UNUSED, const char **argv UNUSED) { -char *method =getenv ("REQUEST_METHOD" ); +const char *method =getenv ("REQUEST_METHOD" );const char *proto_header;char *dir;struct service_cmd *cmd =NULL ;
imap-send.c +3 -3
@@ -1215,9 +1215,9 @@ static int imap_store_msg(struct imap_store *ctx, struct strbuf *msg)static void wrap_in_html (struct strbuf *msg) {struct strbuf buf =STRBUF_INIT ; -static char *content_type ="Content-Type: text/html;\n" ; -static char *pre_open ="<pre>\n" ; -static char *pre_close ="</pre>\n" ; +static const char *content_type ="Content-Type: text/html;\n" ; +static const char *pre_open ="<pre>\n" ; +static const char *pre_close ="</pre>\n" ;const char *body =strstr (msg->buf,"\n\n" );if (!body)
pretty.c +1 -1
@@ -1325,7 +1325,7 @@ int format_set_trailers_options(struct process_trailer_options *opts, static size_t parse_describe_args(const char *start, struct strvec *args) { struct { - char *name; + const char *name; enum { DESCRIBE_ARG_BOOL, DESCRIBE_ARG_INTEGER,
refs.c +1 -1
@@ -159,7 +159,7 @@ void update_ref_namespace(enum ref_namespace namespace, char *ref) {struct ref_namespace_info *info = &ref_namespace[namespace];if (info->ref_updated) -free (info->ref); +free ((char *)info->ref); info->ref = ref; info->ref_updated =1 ; }
refs.h +1 -1
@@ -975,7 +975,7 @@ struct ref_store *get_worktree_ref_store(const struct worktree *wt);*/ struct ref_namespace_info { -char *ref; +const char *ref;enum decoration_type decoration;/*
reftable/record.c +3 -3
@@ -116,7 +116,7 @@ static int decode_string(struct strbuf *dest, struct string_view in)return start_len - in.len; } -static int encode_string (char *str,struct string_view s) +static int encode_string (const char *str,struct string_view s) {struct string_view start = s;int l =strlen (str);
@@ -969,9 +969,9 @@ static int reftable_log_record_decode(void *rec, struct strbuf key,return REFTABLE_FORMAT_ERROR ; } -static int null_streq (char *a,char *b) +static int null_streq (const char *a,const char *b) { -char *empty ="" ; +const char *empty ="" ;if (!a) a = empty;
run-command.c +1 -1
@@ -663,7 +663,7 @@ int start_command(struct child_process *cmd)int need_in, need_out, need_err;int fdin[2 ], fdout[2 ], fderr[2 ];int failed_errno; -char *str; +const char *str;/* * In case of errors we must keep the promise to close FDs
t/helper/test-hashmap.c +2 -1
@@ -36,7 +36,8 @@ static int test_entry_cmp(const void *cmp_data, }static struct test_entry *alloc_test_entry (unsigned int hash, -char *key,char *value) +const char *key, +const char *value) {size_t klen =strlen (key);size_t vlen =strlen (value);
t/helper/test-json-writer.c +5 -5
@@ -174,7 +174,7 @@ static void make_arr4(int pretty)jw_end (&arr4); } -static char *expect_nest1 = +static const char *expect_nest1 ="{\"obj1\":{\"a\":\"abc\",\"b\":42,\"c\":true},\"arr1\":[\"abc\",42,true]}" ;static struct json_writer nest1 =JSON_WRITER_INIT ;
@@ -195,10 +195,10 @@ static void make_nest1(int pretty)jw_release (&arr1); } -static char *expect_inline1 = +static const char *expect_inline1 ="{\"obj1\":{\"a\":\"abc\",\"b\":42,\"c\":true},\"arr1\":[\"abc\",42,true]}" ; -static char *pretty_inline1 = +static const char *pretty_inline1 = ("{\n" " \"obj1\": {\n" " \"a\": \"abc\",\n"
@@ -236,10 +236,10 @@ static void make_inline1(int pretty)jw_end (&inline1); } -static char *expect_inline2 = +static const char *expect_inline2 ="[[1,2],[3,4],{\"a\":\"abc\"}]" ; -static char *pretty_inline2 = +static const char *pretty_inline2 = ("[\n" " [\n" " 1,\n"
t/helper/test-regex.c +2 -2
@@ -20,8 +20,8 @@ static struct reg_flag reg_flags[] = {static int test_regex_bug (void ) { -char *pat ="[^={} \t]+" ; -char *str ="={}\nfred" ; +const char *pat ="[^={} \t]+" ; +const char *str ="={}\nfred" ;regex_t r;regmatch_t m[1 ];
t/helper/test-rot13-filter.c +3 -2
@@ -136,7 +136,7 @@ static void free_delay_entries(void)strmap_clear (&delay,0 ); } -static void add_delay_entry (char *pathname,int count,int requested) +static void add_delay_entry (const char *pathname,int count,int requested) {struct delay_entry *entry =xcalloc (1 ,sizeof (*entry)); entry->count = count;
@@ -189,7 +189,8 @@ static void reply_list_available_blobs_cmd(void)static void command_loop (void ) {for (;;) { -char *buf, *output; +char *buf; +const char *output;char *pathname;struct delay_entry *entry;struct strbuf input =STRBUF_INIT ;
t/unit-tests/t-strbuf.c +6 -4
@@ -2,7 +2,8 @@#include "strbuf.h" /* wrapper that supplies tests with an empty, initialized strbuf */ -static void setup (void (*f)(struct strbuf *,void *),void *data) +static void setup (void (*f)(struct strbuf *,const void *), +const void *data) {struct strbuf buf =STRBUF_INIT ;
@@ -13,7 +14,8 @@ static void setup(void (*f)(struct strbuf*, void*), void *data) }/* wrapper that supplies tests with a populated, initialized strbuf */ -static void setup_populated (void (*f)(struct strbuf *,void *),char *init_str,void *data) +static void setup_populated (void (*f)(struct strbuf *,const void *), +const char *init_str,const void *data) {struct strbuf buf =STRBUF_INIT ;
@@ -64,7 +66,7 @@ static void t_dynamic_init(void)strbuf_release (&buf); } -static void t_addch (struct strbuf *buf,void *data) +static void t_addch (struct strbuf *buf,const void *data) {const char *p_ch = data;const char ch = *p_ch;
@@ -83,7 +85,7 @@ static void t_addch(struct strbuf *buf, void *data) check_char(buf->buf[buf->len], ==, '\0'); } -static void t_addstr (struct strbuf *buf,void *data) +static void t_addstr (struct strbuf *buf,const void *data) {const char *text = data;size_t len =strlen (text);
trailer.c +1 -1
@@ -63,7 +63,7 @@ struct arg_item {static LIST_HEAD (conf_head); -static char *separators =":" ; +static const char *separators =":" ;static int configured;
wt-status.c +1 -1
@@ -2408,7 +2408,7 @@ static void wt_porcelain_v2_print_unmerged_entry(int mode;struct object_id oid; } stages[3 ]; -char *key; +const char *key;char submodule_token[5 ];char unmerged_prefix ='u' ;char eol_char = s->null_termination ?'\0' :'\n' ;
Signature · 1 line
2.45.1.313.g3a57aa566a.dirty
PATCH 2/19 global: assign non-const strings as required
In reply to Patrick SteinhardtThere are several cases where we initialize non-const fields with string constants. This is invalid and will cause warnings once we enable the -Wwrite-strings warning. Adapt those cases to instead use string arrays.
--- builtin/remote.c | 3 ++- diff.c | 3 ++- entry.c | 7 ++++--- ident.c | 9 +++++++-- line-log.c | 3 ++- object-file.c | 3 ++- pretty.c | 5 +++-- refs/reftable-backend.c | 5 +++-- 8 files changed, 25 insertions(+), 13 deletions(-)
builtin/remote.c +2 -1
@@ -494,11 +494,12 @@ static int get_head_names(const struct ref *remote_refs, struct ref_states *statstruct ref *ref, *matches;struct ref *fetch_map =NULL , **fetch_map_tail = &fetch_map;struct refspec_item refspec; +char refspec_str[] ="refs/heads/*" ;memset (&refspec,0 ,sizeof (refspec)); refspec.force =0 ; refspec.pattern =1 ; - refspec.src = refspec.dst ="refs/heads/*" ; + refspec.src = refspec.dst = refspec_str;get_fetch_map (remote_refs, &refspec, &fetch_map_tail,0 ); matches =guess_remote_head (find_ref_by_name (remote_refs,"HEAD" ), fetch_map,1 );
diff.c +2 -1
@@ -7231,11 +7231,12 @@ size_t fill_textconv(struct repository *r,struct diff_filespec *df, char **outbuf) { + static char empty_str[] = "";size_t size;if (!driver) {if (!DIFF_FILE_VALID (df)) { - *outbuf ="" ; + *outbuf = empty_str;return 0 ; }if (diff_populate_filespec (r, df,NULL ))
entry.c +4 -3
@@ -175,6 +175,7 @@ int finish_delayed_checkout(struct checkout *state, int show_progress)struct string_list_item *filter, *path;struct progress *progress =NULL ;struct delayed_checkout *dco = state->delayed_checkout; +char empty_str[] ="" ;if (!state->delayed_checkout)return errs;
@@ -189,7 +190,7 @@ int finish_delayed_checkout(struct checkout *state, int show_progress)if (!async_query_available_blobs (filter->string, &available_paths)) {/* Filter reported an error */ errs =1 ; - filter->string ="" ; + filter->string = empty_str;continue ; }if (available_paths.nr <=0 ) {
@@ -199,7 +200,7 @@ int finish_delayed_checkout(struct checkout *state, int show_progress)* filter from the list (see * "string_list_remove_empty_items" call below). */ - filter->string ="" ; + filter->string = empty_str;continue ; }
@@ -225,7 +226,7 @@ int finish_delayed_checkout(struct checkout *state, int show_progress)* Do not ask the filter for available blobs, * again, as the filter is likely buggy. */ - filter->string ="" ; + filter->string = empty_str;continue ; } ce = index_file_exists(state->istate, path->string,
ident.c +7 -2
@@ -46,9 +46,14 @@ static struct passwd *xgetpwuid_self(int *is_bogus) pw =getpwuid (getuid ());if (!pw) {static struct passwd fallback; - fallback.pw_name ="unknown" ; +static char fallback_name[] ="unknown" ;#ifndef NO_GECOS_IN_PWENT - fallback.pw_gecos ="Unknown" ; +static char fallback_gcos[] ="Unknown" ; +#endif + + fallback.pw_name = fallback_name; +#ifndef NO_GECOS_IN_PWENT + fallback.pw_gecos = fallback_gcos;#endif pw = &fallback;if (is_bogus)
line-log.c +2 -1
@@ -1032,6 +1032,7 @@ static int process_diff_filepair(struct rev_info *rev,struct range_set tmp;struct diff_ranges diff;mmfile_t file_parent, file_target; +char empty_str[] ="" ;assert (pair->two->path);while (rg) {
@@ -1056,7 +1057,7 @@ static int process_diff_filepair(struct rev_info *rev, file_parent.ptr = pair->one->data; file_parent.size = pair->one->size; }else { - file_parent.ptr ="" ; + file_parent.ptr = empty_str; file_parent.size =0 ; }
object-file.c +2 -1
@@ -282,12 +282,13 @@ static struct cached_object { } *cached_objects;static int cached_object_nr, cached_object_alloc; +static char empty_tree_buf[] ="" ;static struct cached_object empty_tree = { .oid = { .hash =EMPTY_TREE_SHA1_BIN_LITERAL , }, .type =OBJ_TREE , - .buf ="" , + .buf = empty_tree_buf, };static struct cached_object *find_cached_object (const struct object_id *oid)
pretty.c +3 -2
@@ -1583,9 +1583,10 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */return 1 ;case 'D' : { +char empty_str[] ="" ;const struct decoration_options opts = { - .prefix ="" , - .suffix ="" + .prefix = empty_str, + .suffix = empty_str, };format_decorations (sb, commit, c->auto_color, &opts);
refs/reftable-backend.c +3 -2
@@ -1285,6 +1285,7 @@ static int write_copy_table(struct reftable_writer *writer, void *cb_data)struct strbuf errbuf =STRBUF_INIT ;size_t logs_nr =0 , logs_alloc =0 , i;const char *committer_info; +char head[] ="HEAD" ;int ret; committer_info =git_committer_info (0 );
@@ -1387,7 +1388,7 @@ static int write_copy_table(struct reftable_writer *writer, void *cb_data)if (append_head_reflog) {ALLOC_GROW (logs, logs_nr +1 , logs_alloc); logs[logs_nr] = logs[logs_nr -1 ]; - logs[logs_nr].refname ="HEAD" ; + logs[logs_nr].refname = head; logs_nr++; } }
@@ -1463,7 +1464,7 @@ static int write_copy_table(struct reftable_writer *writer, void *cb_data)string_list_clear (&skip,0 );strbuf_release (&errbuf);for (i =0 ; i < logs_nr; i++) { -if (!strcmp (logs[i].refname,"HEAD" )) +if (logs[i].refname == head)continue ; logs[i].refname =NULL ;reftable_log_record_release (&logs[i]);
Signature · 1 line
2.45.1.313.g3a57aa566a.dirty
PATCH 3/19 global: convert intentionally-leaking config strings to consts
In reply to Patrick SteinhardtThere are multiple cases where we intentionally leak config strings:
- struct gpg_format is used to track programs that can be used for signing commits, either via gpg(1), gpgsm(1) or ssh-keygen(1). The user can override the commands via several config variables. As the array is populated once, only, and will never be free'd, it is fine to treat the program as a quasi-constant.
- struct ll_merge_driver is used to track merge drivers. Same as with the GPG format, these drivers are populated once and then reused. Its data is never free'd, either.
- struct userdiff_funcname and struct userdiff_driver can be configured via diff.<driver>.* to add additional drivers. Again, these have a global lifetime and are never free'd.
All of these are intentionally kept alive and never free'd. Let's mark the respective fields as const char * and cast away the constness when assigning those values.
--- gpg-interface.c | 4 ++-- merge-ll.c | 11 ++++++++--- userdiff.c | 10 +++++----- userdiff.h | 12 ++++++------ 4 files changed, 21 insertions(+), 16 deletions(-)
gpg-interface.c +2 -2
@@ -34,7 +34,7 @@ static enum signature_trust_level configured_min_trust_level = TRUST_UNDEFINED;struct gpg_format {const char *name; -char *program; +const char *program;const char **verify_args;const char **sigs; int (*verify_signed_buffer)(struct signature_check *sigc,
@@ -783,7 +783,7 @@ static int git_gpg_config(const char *var, const char *value,if (fmtname) { fmt =get_format_by_name (fmtname); -return git_config_string (&fmt->program, var, value); +return git_config_string ((char **) &fmt->program, var, value); }return 0 ;
merge-ll.c +8 -3
@@ -27,7 +27,7 @@ typedef enum ll_merge_result (*ll_merge_fn)(const struct ll_merge_driver *,struct ll_merge_driver {const char *name; -char *description; +const char *description;ll_merge_fn fn;char *recursive;struct ll_merge_driver *next;
@@ -304,8 +304,13 @@ static int read_merge_config(const char *var, const char *value, ll_user_merge_tail = &(fn->next); } -if (!strcmp ("name" , key)) -return git_config_string (&fn->description, var, value); +if (!strcmp ("name" , key)) { +/* +* The description is leaking, but that's okay as we want to +* keep around the merge drivers anyway. +*/ +return git_config_string ((char **) &fn->description, var, value); + }if (!strcmp ("driver" , key)) {if (!value)
userdiff.c +5 -5
@@ -399,7 +399,7 @@ static struct userdiff_driver *userdiff_find_by_namelen(const char *name, size_tstatic int parse_funcname (struct userdiff_funcname *f,const char *k,const char *v,int cflags) { -if (git_config_string (&f->pattern, k, v) <0 ) +if (git_config_string ((char **) &f->pattern, k, v) <0 )return -1 ; f->cflags = cflags;return 0 ;
@@ -445,15 +445,15 @@ int userdiff_config(const char *k, const char *v)if (!strcmp (type,"binary" ))return parse_tristate (&drv->binary, k, v);if (!strcmp (type,"command" )) -return git_config_string (&drv->external, k, v); +return git_config_string ((char **) &drv->external, k, v);if (!strcmp (type,"textconv" )) -return git_config_string (&drv->textconv, k, v); +return git_config_string ((char **) &drv->textconv, k, v);if (!strcmp (type,"cachetextconv" ))return parse_bool (&drv->textconv_want_cache, k, v);if (!strcmp (type,"wordregex" )) -return git_config_string (&drv->word_regex, k, v); +return git_config_string ((char **) &drv->word_regex, k, v);if (!strcmp (type,"algorithm" )) -return git_config_string (&drv->algorithm, k, v); +return git_config_string ((char **) &drv->algorithm, k, v);return 0 ; }
userdiff.h +6 -6
@@ -7,19 +7,19 @@ struct index_state;struct repository ;struct userdiff_funcname { -char *pattern; +const char *pattern;int cflags; };struct userdiff_driver {const char *name; -char *external; -char *algorithm; +const char *external; +const char *algorithm;int binary;struct userdiff_funcname funcname; -char *word_regex; -char *word_regex_multi_byte; -char *textconv; +const char *word_regex; +const char *word_regex_multi_byte; +const char *textconv;struct notes_cache *textconv_cache;int textconv_want_cache; };
Signature · 1 line
2.45.1.313.g3a57aa566a.dirty
PATCH 4/19 compat/win32: fix const-correctness with string constants
In reply to Patrick SteinhardtAdjust various places in our Win32 compatibility layer where we are not assigning string constants to const char * variables.
--- compat/basename.c | 15 +++++++++++++-- compat/mingw.c | 25 +++++++++++++------------ compat/winansi.c | 2 +- 3 files changed, 27 insertions(+), 15 deletions(-)
compat/basename.c +13 -2
@@ -1,6 +1,13 @@#include "../git-compat-util.h" #include "../strbuf.h" +/* +* Both basename(3P) and dirname(3P) are mis-specified because they return a +* non-constant pointer even though it is specified that they may return a +* pointer to internal memory. This variable here is a result of that. +*/ +static char current_directory[] ="." ; +/* Adapted from libiberty's basename.c. */ char *gitbasename (char *path) {
@@ -10,7 +17,7 @@ char *gitbasename (char *path)skip_dos_drive_prefix (&path);if (!path || !*path) -return "." ; +return current_directory;for (base = path; *path; path++) {if (!is_dir_sep (*path))
@@ -33,8 +40,12 @@ char *gitdirname(char *path)char *p = path, *slash =NULL , c;int dos_drive_prefix; +/* +* Same here, dirname(3P) is broken because it returns a non-constant +* pointer that may point to internal memory. +*/ if (!p) -return "." ; +return current_directory;if ((dos_drive_prefix =skip_dos_drive_prefix (&p)) && !*p) goto dot;
compat/mingw.c +13 -12
@@ -2257,6 +2257,7 @@ struct passwd *getpwuid(int uid) {static unsigned initialized;static char user_name[100 ]; +static char unknown[] ="unknown" ;static struct passwd *p;wchar_t buf[100 ];DWORD len;
@@ -2279,7 +2280,7 @@ struct passwd *getpwuid(int uid) p->pw_name = user_name; p->pw_gecos =get_extended_user_info (NameDisplay);if (!p->pw_gecos) - p->pw_gecos ="unknown" ; + p->pw_gecos = unknown; p->pw_dir =NULL ; initialized =1 ;
@@ -2800,16 +2801,16 @@ int is_path_owned_by_current_sid(const char *path, struct strbuf *report)strbuf_addf (report,"'%s' is on a file system that does " "not record ownership\n" , path); }else if (report) { -LPSTR str1, str2, str3, str4, to_free1 =NULL , - to_free3 =NULL , to_local_free2 =NULL , - to_local_free4 =NULL ; +PCSTR str1, str2, str3, str4; +LPSTR to_free1 =NULL , to_free3 =NULL , + to_local_free2 =NULL , to_local_free4 =NULL ; -if (user_sid_to_user_name (sid, &str1)) - to_free1 = str1; +if (user_sid_to_user_name (sid, &to_free1)) + str1 = to_free1;else str1 ="(inconvertible)" ; -if (ConvertSidToStringSidA (sid, &str2)) - to_local_free2 = str2; +if (ConvertSidToStringSidA (sid, &to_local_free2)) + str2 = to_local_free2;else str2 ="(inconvertible)" ;
@@ -2822,13 +2823,13 @@ int is_path_owned_by_current_sid(const char *path, struct strbuf *report) str4 ="(invalid)" ; }else {if (user_sid_to_user_name (current_user_sid, - &str3)) - to_free3 = str3; + &to_free3)) + str3 = to_free3;else str3 ="(inconvertible)" ;if (ConvertSidToStringSidA (current_user_sid, - &str4)) - to_local_free4 = str4; + &to_local_free4)) + str4 = to_local_free4;else str4 ="(inconvertible)" ; }
compat/winansi.c +1 -1
@@ -139,7 +139,7 @@ static void write_console(unsigned char *str, size_t len)/* convert utf-8 to utf-16 */ int wlen =xutftowcsn (wbuf, (char *) str,ARRAY_SIZE (wbuf), len);if (wlen <0 ) { -wchar_t *err =L"[invalid]" ; +const wchar_t *err =L"[invalid]" ;WriteConsoleW (console, err,wcslen (err), &dummy,NULL );return ; }
Signature · 1 line
2.45.1.313.g3a57aa566a.dirty
PATCH 5/19 reftable: improve const correctness when assigning string constants
In reply to Patrick SteinhardtThere are many cases in the reftable tests where we assign string constants to non-const fields. This is harmless because we know that those fields are only used for reading access, but will break once we enable -Wwrite-strings. Add explicit casts to prepare for this.
--- reftable/basics_test.c | 4 +-- reftable/block_test.c | 2 +- reftable/merged_test.c | 45 +++++++++++++-------------- reftable/readwrite_test.c | 47 ++++++++++++++-------------- reftable/stack_test.c | 65 ++++++++++++++++++++------------------- 5 files changed, 82 insertions(+), 81 deletions(-)
reftable/basics_test.c +2 -2
@@ -58,8 +58,8 @@ static void test_binsearch(void)static void test_names_length (void ) { -char *a[] = {"a" ,"b" ,NULL }; -EXPECT (names_length (a) ==2 ); +char *names[] = { (char *)"a" , (char *)"b" ,NULL }; +EXPECT (names_length (names) ==2 ); }static void test_parse_names_normal (void )
reftable/block_test.c +1 -1
@@ -42,7 +42,7 @@ static void test_block_read_write(void)block_writer_init (&bw,BLOCK_TYPE_REF , block.data, block_size, header_off,hash_size (GIT_SHA1_FORMAT_ID )); - rec.u.ref.refname ="" ; + rec.u.ref.refname = (char *)"" ; rec.u.ref.value_type =REFTABLE_REF_DELETION ; n =block_writer_add (&bw, &rec);EXPECT (n ==REFTABLE_API_ERROR );
reftable/merged_test.c +22 -23
128 lines not on this page · raw message
reftable/readwrite_test.c +24 -23
102 lines not on this page · raw message
reftable/stack_test.c +33 -32
181 lines not on this page · raw message
Signature · 1 line
2.45.1.313.g3a57aa566a.dirty
PATCH 6/19 refspec: remove global tag refspec structure
In reply to Patrick SteinhardtWe have a global tag refspec structure that is used by both git-clone(1) and git-fetch(1). Initialization fo the structure will break once we enable -Wwrite-strings, even though the breakage is harmless. While we could just add casts, the structure isn't really required in the first place as we can simply initialize the structures at the respective callsites.
Refactor the code accordingly.
--- builtin/clone.c | 8 ++++++-- builtin/fetch.c | 11 ++++++++--- refspec.c | 13 ------------- refspec.h | 1 - 4 files changed, 14 insertions(+), 19 deletions(-)
builtin/clone.c +6 -2
@@ -523,6 +523,9 @@ static struct ref *wanted_peer_refs(const struct ref *refs,struct ref *head =copy_ref (find_ref_by_name (refs,"HEAD" ));struct ref *local_refs = head;struct ref **tail = head ? &head->next : &local_refs; +struct refspec_item tag_refspec; + +refspec_item_init (&tag_refspec,TAG_REFSPEC ,0 );if (option_single_branch) {struct ref *remote_head =NULL ;
@@ -545,7 +548,7 @@ static struct ref *wanted_peer_refs(const struct ref *refs, &tail, 0);/* if --branch=tag, pull the requested tag explicitly */ -get_fetch_map (remote_head, tag_refspec, &tail,0 ); +get_fetch_map (remote_head, &tag_refspec, &tail,0 ); }free_refs (remote_head); }else {
@@ -555,8 +558,9 @@ static struct ref *wanted_peer_refs(const struct ref *refs, }if (!option_mirror && !option_single_branch && !option_no_tags) -get_fetch_map (refs, tag_refspec, &tail,0 ); +get_fetch_map (refs, &tag_refspec, &tail,0 ); +refspec_item_clear (&tag_refspec);return local_refs; }
builtin/fetch.c +8 -3
@@ -582,11 +582,16 @@ static struct ref *get_ref_map(struct remote *remote, } } -if (tags ==TAGS_SET ) +if (tags ==TAGS_SET ) { +struct refspec_item tag_refspec; +/* also fetch all tags */ -get_fetch_map (remote_refs, tag_refspec, &tail,0 ); -else if (tags ==TAGS_DEFAULT && *autotags) +refspec_item_init (&tag_refspec,TAG_REFSPEC ,0 ); +get_fetch_map (remote_refs, &tag_refspec, &tail,0 ); +refspec_item_clear (&tag_refspec); + }else if (tags ==TAGS_DEFAULT && *autotags) {find_non_local_tags (remote_refs,NULL , &ref_map, &tail); + }/* Now append any refs to be updated opportunistically: */ *tail = orefs;
refspec.c +0 -13
@@ -7,19 +7,6 @@#include "refspec.h" #include "strbuf.h" -static struct refspec_item s_tag_refspec = { - .force =0 , - .pattern =1 , - .matching =0 , - .exact_sha1 =0 , - .negative =0 , - .src ="refs/tags/*" , - .dst ="refs/tags/*" , -}; - -/* See TAG_REFSPEC for the string version */ -const struct refspec_item *tag_refspec = &s_tag_refspec; -/* * Parses the provided refspec 'refspec' and populates the refspec_item 'item'. * Returns 1 if successful and 0 if the refspec is invalid.
refspec.h +0 -1
@@ -2,7 +2,6 @@#define REFSPEC_H #define TAG_REFSPEC "refs/tags/*:refs/tags/*" -extern const struct refspec_item *tag_refspec; /** * A struct refspec_item holds the parsed interpretation of a refspec. If it
Signature · 1 line
2.45.1.313.g3a57aa566a.dirty
PATCH 7/19 http: do not assign string constant to non-const field
In reply to Patrick SteinhardtIn write_accept_language(), we put all acceptable languages into an array. While all entries in that array are allocated strings, the final entry in that array is a string constant. This is fine because we explicitly skip over the last entry when freeing the array, but will cause warnings once we enable -Wwrite-strings.
Adapt the code to also allocate the final entry.
--- http.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
http.c +2 -3
@@ -1974,7 +1974,7 @@ static void write_accept_language(struct strbuf *buf)/* add '*' */ REALLOC_ARRAY (language_tags, num_langs +1 ); - language_tags[num_langs++] ="*" ;/* it's OK; this won't be freed */ + language_tags[num_langs++] =xstrdup ("*" );/* compute decimal_places */ for (max_q = 1, decimal_places = 0;
@@ -2004,8 +2004,7 @@ static void write_accept_language(struct strbuf *buf) } } -/* free language tags -- last one is a static '*' */ -for (i =0 ; i < num_langs -1 ; i++) +for (i =0 ; i < num_langs; i++)free (language_tags[i]);free (language_tags); }
Signature · 1 line
2.45.1.313.g3a57aa566a.dirty
PATCH 8/19 line-log: always allocate the output prefix
In reply to Patrick SteinhardtThe returned string by output_prefix() is sometimes a string constant and sometimes an allocated string. This has been fine until now because we always leak the allocated strings, and thus we never tried to free the string constant.
Fix the code to always return an allocated string and free the returned value at all callsites.
--- line-log.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
line-log.c +11 -7
@@ -899,14 +899,12 @@ static void print_line(const char *prefix, char first,static char *output_prefix (struct diff_options *opt) { -char *prefix ="" ; -if (opt->output_prefix) {struct strbuf *sb = opt->output_prefix (opt, opt->output_prefix_data); - prefix = sb->buf; +return sb->buf; + }else { +return xstrdup ("" ); } - -return prefix; }static void dump_diff_hacky_one (struct rev_info *rev,struct line_log_data *range)
@@ -927,7 +925,7 @@ static void dump_diff_hacky_one(struct rev_info *rev, struct line_log_data *rangconst char *c_context =diff_get_color (opt->use_color,DIFF_CONTEXT );if (!pair || !diff) -return ; + goto out;if (pair->one->oid_valid)fill_line_ends (rev->diffopt.repo, pair->one, &p_lines, &p_ends);
@@ -1002,8 +1000,10 @@ static void dump_diff_hacky_one(struct rev_info *rev, struct line_log_data *rang c_context, c_reset, opt->file); } +out:free (p_ends);free (t_ends); +free (prefix); }/*
@@ -1012,7 +1012,11 @@ static void dump_diff_hacky_one(struct rev_info *rev, struct line_log_data *rang*/ static void dump_diff_hacky (struct rev_info *rev,struct line_log_data *range) { -fprintf (rev->diffopt.file,"%s\n" ,output_prefix (&rev->diffopt)); +char *prefix =output_prefix (&rev->diffopt); + +fprintf (rev->diffopt.file,"%s\n" , prefix); +free (prefix); +while (range) {dump_diff_hacky_one (rev, range); range = range->next;
Signature · 1 line
2.45.1.313.g3a57aa566a.dirty
PATCH 9/19 object-file: make `buf` parameter of `index_mem()` a constant
In reply to Patrick SteinhardtThe buf parameter of index_mem() is a non-constant string. This will break once we enable -Wwrite-strings because we also pass constants from at least one callsite.
Adapt the parameter to be a constant. As we cannot free the buffer without casting now, this also requires us to move the lifetime of the nested buffer around.
--- object-file.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
object-file.c +7 -7
@@ -2483,12 +2483,13 @@ static int hash_format_check_report(struct fsck_options *opts UNUSED, }static int index_mem (struct index_state *istate, -struct object_id *oid,void *buf,size_t size, +struct object_id *oid, +const void *buf,size_t size,enum object_type type,const char *path,unsigned flags) { +struct strbuf nbuf =STRBUF_INIT ;int ret =0 ; -int re_allocated =0 ;int write_object = flags &HASH_WRITE_OBJECT ;if (!type)
@@ -2498,11 +2499,10 @@ static int index_mem(struct index_state *istate,* Convert blobs to git internal format */ if ((type ==OBJ_BLOB ) && path) { -struct strbuf nbuf =STRBUF_INIT ;if (convert_to_git (istate, path, buf, size, &nbuf,get_conv_flags (flags))) { - buf =strbuf_detach (&nbuf, &size); - re_allocated =1 ; + buf = nbuf.buf; + size = nbuf.len; } }if (flags &HASH_FORMAT_CHECK ) {
@@ -2519,8 +2519,8 @@ static int index_mem(struct index_state *istate, ret =write_object_file (buf, size, type, oid); elsehash_object_file (the_hash_algo ,buf ,size ,type ,oid ); -if (re_allocated) -free (buf); + +strbuf_release (&nbuf);return ret; }
Signature · 1 line
2.45.1.313.g3a57aa566a.dirty
PATCH 10/19 parse-options: cast long name for OPTION_ALIAS
In reply to Patrick SteinhardtWe assign the long name for OPTION_ALIAS options to a non-constant value field. We know that the variable will never be written to, but this will cause warnings once we enable -Wwrite-strings.
Cast away the constness to be prepared for this change.
--- parse-options.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
parse-options.h +1 -1
@@ -355,7 +355,7 @@ struct option { .type = OPTION_ALIAS, \ .short_name = (s), \ .long_name = (l), \ - .value = (source_long_name), \ + .value = (char *)(source_long_name), \ }#define OPT_SUBCOMMAND_F (l, v, fn, f) { \
Signature · 1 line
2.45.1.313.g3a57aa566a.dirty
PATCH 11/19 send-pack: always allocate receive status
In reply to Patrick SteinhardtIn receive_status(), we record the reason why ref updates have been rejected by the remote via the remote_status. But while we allocate the assigned string when a reason was given, we assign a string constant when no reason was given.
This has been working fine so far due to two reasons:
- We don't ever free the refs in git-send-pack(1)'
- Remotes always give a reason, at least as implemented by Git proper.
Adapt the code to always allocate the receive status string and free the refs.
--- builtin/send-pack.c | 2 ++ send-pack.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)
builtin/send-pack.c +2 -0
@@ -336,5 +336,7 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)/* stable plumbing output; do not modify or localize */ fprintf (stderr,"Everything up-to-date\n" ); +free_refs (remote_refs); +free_refs (local_refs);return ret; }
send-pack.c +1 -1
@@ -259,7 +259,7 @@ static int receive_status(struct packet_reader *reader, struct ref *refs)if (p) hint->remote_status =xstrdup (p);else - hint->remote_status ="failed" ; + hint->remote_status =xstrdup ("failed" ); }else { hint->status =REF_STATUS_OK ; hint->remote_status =xstrdup_or_null (p);
Signature · 1 line
2.45.1.313.g3a57aa566a.dirty
PATCH 12/19 remote-curl: avoid assigning string constant to non-const variable
In reply to Patrick SteinhardtWhen processing remote options, we split the option line into two by searching for a space. If there is one, we replace the space with '\0', otherwise we implicitly assume that the value is "true" and thus assign a string constant.
As the return value of strchr(3P) weirdly enough is a char * even though it gets a const char * as input, the assigned-to variable also is a non-constant. This is fine though because the argument is in fact an allocated string, and thus we are allowed to modify it. But this will break once we enable -Wwrite-strings.
Refactor the code stop splitting the fields with '\0' altogether. Instead, we can pass the length of the option name to set_option() and then use strncmp(3P) instead of strcmp(3P).
--- remote-curl.c | 58 +++++++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 27 deletions(-)
remote-curl.c +31 -27
@@ -58,9 +58,9 @@ struct options {static struct options options;static struct string_list cas_options =STRING_LIST_INIT_DUP ; -static int set_option (const char *name,const char *value) +static int set_option (const char *name,size_t namelen,const char *value) { -if (!strcmp (name,"verbosity" )) { +if (!strncmp (name,"verbosity" , namelen)) {char *end;int v =strtol (value, &end,10 );if (value == end || *end)
@@ -68,7 +68,7 @@ static int set_option(const char *name, const char *value) options.verbosity = v;return 0 ; } -else if (!strcmp (name,"progress" )) { +else if (!strncmp (name,"progress" , namelen)) {if (!strcmp (value,"true" )) options.progress =1 ;else if (!strcmp (value,"false" ))
@@ -77,7 +77,7 @@ static int set_option(const char *name, const char *value)return -1 ;return 0 ; } -else if (!strcmp (name,"depth" )) { +else if (!strncmp (name,"depth" , namelen)) {char *end;unsigned long v =strtoul (value, &end,10 );if (value == end || *end)
@@ -85,15 +85,15 @@ static int set_option(const char *name, const char *value) options.depth = v;return 0 ; } -else if (!strcmp (name,"deepen-since" )) { +else if (!strncmp (name,"deepen-since" , namelen)) { options.deepen_since =xstrdup (value);return 0 ; } -else if (!strcmp (name,"deepen-not" )) { +else if (!strncmp (name,"deepen-not" , namelen)) {string_list_append (&options.deepen_not, value);return 0 ; } -else if (!strcmp (name,"deepen-relative" )) { +else if (!strncmp (name,"deepen-relative" , namelen)) {if (!strcmp (value,"true" )) options.deepen_relative =1 ;else if (!strcmp (value,"false" ))
@@ -102,7 +102,7 @@ static int set_option(const char *name, const char *value)return -1 ;return 0 ; } -else if (!strcmp (name,"followtags" )) { +else if (!strncmp (name,"followtags" , namelen)) {if (!strcmp (value,"true" )) options.followtags =1 ;else if (!strcmp (value,"false" ))
@@ -111,7 +111,7 @@ static int set_option(const char *name, const char *value)return -1 ;return 0 ; } -else if (!strcmp (name,"dry-run" )) { +else if (!strncmp (name,"dry-run" , namelen)) {if (!strcmp (value,"true" )) options.dry_run =1 ;else if (!strcmp (value,"false" ))
@@ -120,7 +120,7 @@ static int set_option(const char *name, const char *value)return -1 ;return 0 ; } -else if (!strcmp (name,"check-connectivity" )) { +else if (!strncmp (name,"check-connectivity" , namelen)) {if (!strcmp (value,"true" )) options.check_self_contained_and_connected =1 ;else if (!strcmp (value,"false" ))
@@ -129,7 +129,7 @@ static int set_option(const char *name, const char *value)return -1 ;return 0 ; } -else if (!strcmp (name,"cas" )) { +else if (!strncmp (name,"cas" , namelen)) {struct strbuf val =STRBUF_INIT ;strbuf_addstr (&val,"--force-with-lease=" );if (*value !='"' )
@@ -139,7 +139,7 @@ static int set_option(const char *name, const char *value)string_list_append (&cas_options, val.buf);strbuf_release (&val);return 0 ; - }else if (!strcmp (name,TRANS_OPT_FORCE_IF_INCLUDES )) { + }else if (!strncmp (name,TRANS_OPT_FORCE_IF_INCLUDES , namelen)) {if (!strcmp (value,"true" )) options.force_if_includes =1 ;else if (!strcmp (value,"false" ))
@@ -147,7 +147,7 @@ static int set_option(const char *name, const char *value)else return -1 ;return 0 ; - }else if (!strcmp (name,"cloning" )) { + }else if (!strncmp (name,"cloning" , namelen)) {if (!strcmp (value,"true" )) options.cloning =1 ;else if (!strcmp (value,"false" ))
@@ -155,7 +155,7 @@ static int set_option(const char *name, const char *value)else return -1 ;return 0 ; - }else if (!strcmp (name,"update-shallow" )) { + }else if (!strncmp (name,"update-shallow" , namelen)) {if (!strcmp (value,"true" )) options.update_shallow =1 ;else if (!strcmp (value,"false" ))
@@ -163,7 +163,7 @@ static int set_option(const char *name, const char *value)else return -1 ;return 0 ; - }else if (!strcmp (name,"pushcert" )) { + }else if (!strncmp (name,"pushcert" , namelen)) {if (!strcmp (value,"true" )) options.push_cert =SEND_PACK_PUSH_CERT_ALWAYS ;else if (!strcmp (value,"false" ))
@@ -173,7 +173,7 @@ static int set_option(const char *name, const char *value)else return -1 ;return 0 ; - }else if (!strcmp (name,"atomic" )) { + }else if (!strncmp (name,"atomic" , namelen)) {if (!strcmp (value,"true" )) options.atomic =1 ;else if (!strcmp (value,"false" ))
@@ -181,7 +181,7 @@ static int set_option(const char *name, const char *value)else return -1 ;return 0 ; - }else if (!strcmp (name,"push-option" )) { + }else if (!strncmp (name,"push-option" , namelen)) {if (*value !='"' )string_list_append (&options.push_options, value);else {
@@ -192,7 +192,7 @@ static int set_option(const char *name, const char *value) strbuf_detach(&unquoted, NULL)); }return 0 ; - }else if (!strcmp (name,"family" )) { + }else if (!strncmp (name,"family" , namelen)) {if (!strcmp (value,"ipv4" )) git_curl_ipresolve =CURL_IPRESOLVE_V4 ;else if (!strcmp (value,"ipv6" ))
@@ -202,16 +202,16 @@ static int set_option(const char *name, const char *value)else return -1 ;return 0 ; - }else if (!strcmp (name,"from-promisor" )) { + }else if (!strncmp (name,"from-promisor" , namelen)) { options.from_promisor =1 ;return 0 ; - }else if (!strcmp (name,"refetch" )) { + }else if (!strncmp (name,"refetch" , namelen)) { options.refetch =1 ;return 0 ; - }else if (!strcmp (name,"filter" )) { + }else if (!strncmp (name,"filter" , namelen)) { options.filter =xstrdup (value);return 0 ; - }else if (!strcmp (name,"object-format" )) { + }else if (!strncmp (name,"object-format" , namelen)) { options.object_format =1 ;if (strcmp (value,"true" ))die (_ ("unknown value for object-format: %s" ), value);
@@ -1588,15 +1588,19 @@ int cmd_main(int argc, const char **argv)parse_push (&buf); }else if (skip_prefix (buf.buf,"option " , &arg)) { -char *value =strchr (arg,' ' ); +const char *value =strchr (arg,' ' ); +size_t arglen;int result; -if (value) - *value++ ='\0' ; -else +if (value) { + arglen = value - arg; + value++; + }else { + arglen =strlen (arg); value ="true" ; + } - result =set_option (arg, value); + result =set_option (arg, arglen, value);if (!result)printf ("ok\n" );else if (result <0 )
Signature · 1 line
2.45.1.313.g3a57aa566a.dirty
PATCH 13/19 revision: always store allocated strings in output encoding
In reply to Patrick SteinhardtThe git_log_output_encoding variable can be set via the --encoding= option. When doing so, we conditionally either assign it to the passed value, or if the value is "none" we assign it the empty string. Depending on which of the both code paths we pick though, the variable may end up being assigned either an allocated string or a string constant.
This is somewhat risky and may easily lead to bugs when a different code path may want to reassign a new value to it, freeing the previous value. We already to this when parsing the "i18n.logoutputencoding" config in git_default_i18n_config(). But because the config is typically parsed before we parse command line options this has been fine so far.
Regardless of that, safeguard the code such that the variable always contains an allocated string. While at it, also free the old value in case there was any to plug a potential memory leak.
--- revision.c | 3 ++- t/t3900-i18n-commit.sh | 1 + t/t3901-i18n-patch.sh | 1 + 3 files changed, 4 insertions(+), 1 deletion(-)
revision.c +2 -1
@@ -2650,10 +2650,11 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg }else if (!strcmp (arg,"--invert-grep" )) { revs->grep_filter.no_body_match =1 ; }else if ((argcount =parse_long_opt ("encoding" , argv, &optarg))) { +free (git_log_output_encoding);if (strcmp (optarg,"none" )) git_log_output_encoding =xstrdup (optarg);else - git_log_output_encoding ="" ; + git_log_output_encoding =xstrdup ("" );return argcount; }else if (!strcmp (arg,"--reverse" )) { revs->reverse ^=1 ;
t/t3900-i18n-commit.sh +1 -0
@@ -5,6 +5,7 @@ test_description='commit and log output encodings' +TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh compare_with () {
t/t3901-i18n-patch.sh +1 -0
@@ -8,6 +8,7 @@ test_description='i18n settings and format-patch | am pipe' GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME +TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh check_encoding () {
Signature · 1 line
2.45.1.313.g3a57aa566a.dirty
PATCH 14/19 mailmap: always store allocated strings in mailmap blob
In reply to Patrick SteinhardtSame as with the preceding commit, the git_mailmap_blob may sometimes contain an allocated string and sometimes it may contain a string constant. This is risky and can easily lead to bugs in case the variable is getting re-assigned, where the code may then try to free the previous value to avoid memory leaks.
Safeguard the code by always storing allocated strings in the variable.
--- mailmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mailmap.c +1 -1
@@ -216,7 +216,7 @@ int read_mailmap(struct string_list *map) map->cmp = namemap_cmp;if (!git_mailmap_blob &&is_bare_repository ()) - git_mailmap_blob ="HEAD:.mailmap" ; + git_mailmap_blob =xstrdup ("HEAD:.mailmap" );if (!startup_info->have_repository || !is_bare_repository ()) err |= read_mailmap_file(map, ".mailmap",
Signature · 1 line
2.45.1.313.g3a57aa566a.dirty
PATCH 15/19 imap-send: drop global `imap_server_conf` variable
In reply to Patrick SteinhardtIn "imap-send.c", we have a global sturct imap_server_conf variable that keeps track of the configuration of the IMAP server. This variable is being populated mostly via the Git configuration.
Refactor the code to allocate the structure on the stack instead of having it globally. This change allows us to track its lifetime more closely.
--- imap-send.c | 57 ++++++++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 27 deletions(-)
imap-send.c +30 -27
@@ -82,10 +82,6 @@ struct imap_server_conf {char *auth_method; }; -static struct imap_server_conf server = { - .ssl_verify =1 , -}; -struct imap_socket {int fd[2 ];SSL *ssl;
@@ -110,6 +106,7 @@ struct imap { };struct imap_store { +const struct imap_server_conf *cfg;/* currently open mailbox */ const char *name;/* foreign! maybe preset? */ int uidvalidity;
@@ -194,8 +191,8 @@ static void socket_perror(const char *func, struct imap_socket *sock, int ret)#ifdef NO_OPENSSL static int ssl_socket_connect(struct imap_socket *sock UNUSED, - int use_tls_only UNUSED, - int verify UNUSED) +const struct imap_server_conf *cfg, + int use_tls_only UNUSED) {fprintf (stderr,"SSL requested but SSL support not compiled in\n" );return -1 ;
@@ -250,7 +247,9 @@ static int verify_hostname(X509 *cert, const char *hostname) cname, hostname); } -static int ssl_socket_connect (struct imap_socket *sock,int use_tls_only,int verify) +static int ssl_socket_connect (struct imap_socket *sock, +const struct imap_server_conf *cfg, +int use_tls_only) {#if (OPENSSL_VERSION_NUMBER >=0x10000000L )const SSL_METHOD *meth;
@@ -279,7 +278,7 @@ static int ssl_socket_connect(struct imap_socket *sock, int use_tls_only, int veif (use_tls_only)SSL_CTX_set_options (ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3); -if (verify) +if (cfg->ssl_verify)SSL_CTX_set_verify (ctx,SSL_VERIFY_PEER ,NULL );if (!SSL_CTX_set_default_verify_paths (ctx)) {
@@ -306,9 +305,9 @@ static int ssl_socket_connect(struct imap_socket *sock, int use_tls_only, int ve* OpenSSL does not document this function, but the implementation * returns 1 on success, 0 on failure after calling SSLerr(). */ - ret =SSL_set_tlsext_host_name (sock->ssl, server.host); + ret =SSL_set_tlsext_host_name (sock->ssl, cfg->host);if (ret !=1 ) -warning ("SSL_set_tlsext_host_name(%s) failed." , server.host); +warning ("SSL_set_tlsext_host_name(%s) failed." , cfg->host);#endif ret =SSL_connect (sock->ssl);
@@ -317,12 +316,12 @@ static int ssl_socket_connect(struct imap_socket *sock, int use_tls_only, int vereturn -1 ; } -if (verify) { +if (cfg->ssl_verify) {/* make sure the hostname matches that of the certificate */ cert =SSL_get_peer_certificate (sock->ssl);if (!cert)return error ("unable to get peer certificate." ); -if (verify_hostname (cert, server.host) <0 ) +if (verify_hostname (cert, cfg->host) <0 )return -1 ; }
@@ -895,7 +894,7 @@ static int auth_cram_md5(struct imap_store *ctx, const char *prompt)int ret;char *response; - response =cram (prompt, server.user, server.pass); + response =cram (prompt, ctx->cfg->user, ctx->cfg->pass); ret =socket_write (&ctx->imap->buf.sock, response,strlen (response));if (ret !=strlen (response))
@@ -935,6 +934,7 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, const cCALLOC_ARRAY (ctx,1 ); + ctx->cfg = srvc; ctx->imap =CALLOC_ARRAY (imap,1 ); imap->buf.sock.fd[0 ] = imap->buf.sock.fd[1 ] =-1 ; imap->in_progress_append = &imap->in_progress;
@@ -1035,7 +1035,7 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, const c imap->buf.sock.fd[1 ] =dup (s);if (srvc->use_ssl && -ssl_socket_connect (&imap->buf.sock,0 , srvc->ssl_verify)) { +ssl_socket_connect (&imap->buf.sock, srvc,0 )) {close (s); goto bail; }
@@ -1068,8 +1068,7 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, const cif (!srvc->use_ssl &&CAP (STARTTLS )) {if (imap_exec (ctx,NULL ,"STARTTLS" ) !=RESP_OK ) goto bail; -if (ssl_socket_connect (&imap->buf.sock,1 , - srvc->ssl_verify)) +if (ssl_socket_connect (&imap->buf.sock, srvc,1 )) goto bail;/* capabilities may have changed, so get the new capabilities */ if (imap_exec (ctx,NULL ,"CAPABILITY" ) !=RESP_OK )
@@ -1299,23 +1298,24 @@ static int split_msg(struct strbuf *all_msgs, struct strbuf *msg, int *ofs)static int git_imap_config (const char *var,const char *val,const struct config_context *ctx,void *cb) { +struct imap_server_conf *cfg = cb;if (!strcmp ("imap.sslverify" , var)) - server.ssl_verify =git_config_bool (var, val); + cfg->ssl_verify =git_config_bool (var, val);else if (!strcmp ("imap.preformattedhtml" , var)) - server.use_html =git_config_bool (var, val); + cfg->use_html =git_config_bool (var, val);else if (!strcmp ("imap.folder" , var)) -return git_config_string (&server.folder, var, val); +return git_config_string (&cfg->folder, var, val);else if (!strcmp ("imap.user" , var)) -return git_config_string (&server.user, var, val); +return git_config_string (&cfg->user, var, val);else if (!strcmp ("imap.pass" , var)) -return git_config_string (&server.pass, var, val); +return git_config_string (&cfg->pass, var, val);else if (!strcmp ("imap.tunnel" , var)) -return git_config_string (&server.tunnel, var, val); +return git_config_string (&cfg->tunnel, var, val);else if (!strcmp ("imap.authmethod" , var)) -return git_config_string (&server.auth_method, var, val); +return git_config_string (&cfg->auth_method, var, val);else if (!strcmp ("imap.port" , var)) - server.port =git_config_int (var, val, ctx->kvi); + cfg->port =git_config_int (var, val, ctx->kvi);else if (!strcmp ("imap.host" , var)) {if (!val) {return config_error_nonbool (var);
@@ -1324,11 +1324,11 @@ static int git_imap_config(const char *var, const char *val, val +=5 ; else if (starts_with(val, "imaps:")) { val +=6 ; - server.use_ssl =1 ; + cfg->use_ssl =1 ; }if (starts_with (val,"//" )) val +=2 ; - server.host =xstrdup (val); + cfg->host =xstrdup (val); } }else return git_default_config (var, val, ctx, cb);
@@ -1497,12 +1497,15 @@ static int curl_append_msgs_to_imap(struct imap_server_conf *server,int cmd_main (int argc,const char **argv) { +struct imap_server_conf server = { + .ssl_verify =1 , + };struct strbuf all_msgs =STRBUF_INIT ;int total;int nongit_ok;setup_git_directory_gently (&nongit_ok); -git_config (git_imap_config,NULL ); +git_config (git_imap_config, &server); argc =parse_options (argc, (const char **)argv,"" , imap_send_options, imap_send_usage,0 );
Signature · 1 line
2.45.1.313.g3a57aa566a.dirty
PATCH 16/19 imap-send: fix leaking memory in `imap_server_conf`
In reply to Patrick SteinhardtWe never free any of the config strings that we populate into the struct imap_server_conf. Fix this by creating a common exit path where we can free resources.
While at it, drop the unused variables imap_server_conf::name and nongit_ok.
--- imap-send.c | 68 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 25 deletions(-)
imap-send.c +43 -25
@@ -69,7 +69,6 @@ static void imap_warn(const char *, ...);static char *next_arg (char **);struct imap_server_conf { -const char *name;char *tunnel;char *host;int port;
@@ -1300,23 +1299,28 @@ static int git_imap_config(const char *var, const char *val, {struct imap_server_conf *cfg = cb; -if (!strcmp ("imap.sslverify" , var)) +if (!strcmp ("imap.sslverify" , var)) { cfg->ssl_verify =git_config_bool (var, val); -else if (!strcmp ("imap.preformattedhtml" , var)) + }else if (!strcmp ("imap.preformattedhtml" , var)) { cfg->use_html =git_config_bool (var, val); -else if (!strcmp ("imap.folder" , var)) + }else if (!strcmp ("imap.folder" , var)) { +FREE_AND_NULL (cfg->folder);return git_config_string (&cfg->folder, var, val); -else if (!strcmp ("imap.user" , var)) + }else if (!strcmp ("imap.user" , var)) { +FREE_AND_NULL (cfg->folder);return git_config_string (&cfg->user, var, val); -else if (!strcmp ("imap.pass" , var)) + }else if (!strcmp ("imap.pass" , var)) { +FREE_AND_NULL (cfg->folder);return git_config_string (&cfg->pass, var, val); -else if (!strcmp ("imap.tunnel" , var)) + }else if (!strcmp ("imap.tunnel" , var)) { +FREE_AND_NULL (cfg->folder);return git_config_string (&cfg->tunnel, var, val); -else if (!strcmp ("imap.authmethod" , var)) + }else if (!strcmp ("imap.authmethod" , var)) { +FREE_AND_NULL (cfg->folder);return git_config_string (&cfg->auth_method, var, val); -else if (!strcmp ("imap.port" , var)) + }else if (!strcmp ("imap.port" , var)) { cfg->port =git_config_int (var, val, ctx->kvi); -else if (!strcmp ("imap.host" , var)) { + }else if (!strcmp ("imap.host" , var)) {if (!val) {return config_error_nonbool (var); }else {
@@ -1330,8 +1334,9 @@ static int git_imap_config(const char *var, const char *val, val +=2 ; cfg->host =xstrdup (val); } - }else + }else {return git_default_config (var, val, ctx, cb); + }return 0 ; }
@@ -1502,9 +1507,9 @@ int cmd_main(int argc, const char **argv) };struct strbuf all_msgs =STRBUF_INIT ;int total; -int nongit_ok; +int ret; -setup_git_directory_gently (&nongit_ok); +setup_git_directory_gently (NULL );git_config (git_imap_config, &server); argc =parse_options (argc, (const char **)argv,"" , imap_send_options, imap_send_usage,0 );
@@ -1529,42 +1534,55 @@ int cmd_main(int argc, const char **argv)if (!server.folder) {fprintf (stderr,"no imap store specified\n" ); -return 1 ; + ret =1 ; + goto out; }if (!server.host) {if (!server.tunnel) {fprintf (stderr,"no imap host specified\n" ); -return 1 ; + ret =1 ; + goto out; } - server.host ="tunnel" ; + server.host =xstrdup ("tunnel" ); }/* read the messages */ if (strbuf_read (&all_msgs,0 ,0 ) <0 ) {error_errno (_ ("could not read from stdin" )); -return 1 ; + ret =1 ; + goto out; }if (all_msgs.len ==0 ) {fprintf (stderr,"nothing to send\n" ); -return 1 ; + ret =1 ; + goto out; } total =count_messages (&all_msgs);if (!total) {fprintf (stderr,"no messages to send\n" ); -return 1 ; + ret =1 ; + goto out; }/* write it to the imap server */ if (server.tunnel) -return append_msgs_to_imap (&server, &all_msgs, total); - + ret =append_msgs_to_imap (&server, &all_msgs, total);#ifdef USE_CURL_FOR_IMAP_SEND -if (use_curl) -return curl_append_msgs_to_imap (&server, &all_msgs, total); + else if (use_curl) + ret =curl_append_msgs_to_imap (&server, &all_msgs, total);#endif - -return append_msgs_to_imap (&server, &all_msgs, total); + else + ret =append_msgs_to_imap (&server, &all_msgs, total); + +out: +free (server.tunnel); +free (server.host); +free (server.folder); +free (server.user); +free (server.pass); +free (server.auth_method); +return ret; }
Signature · 1 line
2.45.1.313.g3a57aa566a.dirty
PATCH 17/19 builtin/rebase: adapt code to not assign string constants to non-const
In reply to Patrick SteinhardtWhen computing the rebase strategy we temporarily assign a string constant to options.strategy before we call xstrdup() on it. Furthermore, the default backend is being assigned a string constant via REBASE_OPTIONS_INIT. Both of these will cause warnings once we enable -Wwrite-strings.
Adapt the code such that we only store allocated strings in those variables.
--- builtin/rebase.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
builtin/rebase.c +9 -7
@@ -135,7 +135,6 @@ struct rebase_options { .type = REBASE_UNSPECIFIED, \ .empty = EMPTY_UNSPECIFIED, \ .keep_empty = 1, \ - .default_backend = "merge", \ .flags = REBASE_NO_QUIET, \ .git_am_opts = STRVEC_INIT, \ .exec = STRING_LIST_INIT_NODUP, \
@@ -796,6 +795,7 @@ static int rebase_config(const char *var, const char *value, }if (!strcmp (var,"rebase.backend" )) { +FREE_AND_NULL (opts->default_backend);return git_config_string (&opts->default_backend, var, value); }
@@ -1471,12 +1471,11 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) }if (options.strategy_opts.nr && !options.strategy) - options.strategy ="ort" ; - -if (options.strategy) { - options.strategy =xstrdup (options.strategy); + options.strategy =xstrdup ("ort" ); +else + options.strategy =xstrdup_or_null (options.strategy); +if (options.strategy)imply_merge (&options,"--strategy" ); - }if (options.root && !options.onto_name)imply_merge (&options,"--root without --onto" );
@@ -1522,7 +1521,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) }if (options.type ==REBASE_UNSPECIFIED ) { -if (!strcmp (options.default_backend,"merge" )) +if (!options.default_backend) + options.type =REBASE_MERGE ; +else if (!strcmp (options.default_backend,"merge" )) options.type =REBASE_MERGE ;else if (!strcmp (options.default_backend,"apply" )) options.type =REBASE_APPLY ;
@@ -1833,6 +1834,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) cleanup:strbuf_release (&buf);strbuf_release (&revisions); +free (options.default_backend);free (options.reflog_action);free (options.head_name);strvec_clear (&options.git_am_opts);
Signature · 1 line
2.45.1.313.g3a57aa566a.dirty
PATCH 18/19 builtin/merge: always store allocated strings in `pull_twohead`
In reply to Patrick SteinhardtThe pull_twohead configuration may sometimes contain an allocated string, and sometimes it may contain a string constant. Refactor this to instead always store an allocated string such that we can release its resources without risk.
While at it, manage the lifetime of other config strings, as well. Note that we explicitly don't free cleanup_arg here. This is because the variable may be assigned a string constant via command line options.
--- builtin/merge.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
builtin/merge.c +11 -7
@@ -611,17 +611,19 @@ static int git_merge_config(const char *k, const char *v,return 0 ; } -if (!strcmp (k,"merge.diffstat" ) || !strcmp (k,"merge.stat" )) +if (!strcmp (k,"merge.diffstat" ) || !strcmp (k,"merge.stat" )) { show_diffstat =git_config_bool (k, v); -else if (!strcmp (k,"merge.verifysignatures" )) + }else if (!strcmp (k,"merge.verifysignatures" )) { verify_signatures =git_config_bool (k, v); -else if (!strcmp (k,"pull.twohead" )) + }else if (!strcmp (k,"pull.twohead" )) { +FREE_AND_NULL (pull_twohead);return git_config_string (&pull_twohead, k, v); -else if (!strcmp (k,"pull.octopus" )) + }else if (!strcmp (k,"pull.octopus" )) { +FREE_AND_NULL (pull_octopus);return git_config_string (&pull_octopus, k, v); -else if (!strcmp (k,"commit.cleanup" )) + }else if (!strcmp (k,"commit.cleanup" )) {return git_config_string (&cleanup_arg, k, v); -else if (!strcmp (k,"merge.ff" )) { + }else if (!strcmp (k,"merge.ff" )) {int boolval =git_parse_maybe_bool (v);if (0 <= boolval) { fast_forward = boolval ?FF_ALLOW :FF_NO ;
@@ -1294,7 +1296,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)if (!pull_twohead) {char *default_strategy =getenv ("GIT_TEST_MERGE_ALGORITHM" );if (default_strategy && !strcmp (default_strategy,"ort" )) - pull_twohead ="ort" ; + pull_twohead =xstrdup ("ort" ); }init_diff_ui_defaults ();
@@ -1793,6 +1795,8 @@ int cmd_merge(int argc, const char **argv, const char *prefix) }strbuf_release (&buf);free (branch_to_free); +free (pull_twohead); +free (pull_octopus);discard_index (the_repository->index);return ret; }
Signature · 1 line
2.45.1.313.g3a57aa566a.dirty
PATCH 19/19 config.mak.dev: enable `-Wwrite-strings` warning
In reply to Patrick SteinhardtWriting to string constants is undefined behaviour and must be avoided in C. Even so, the compiler does not help us with this by default because those constants are not in fact marked as const. This makes it rather easy to accidentally assign a constant to a non-const variable or field and then later on try to either free it or write to it.
Enable -Wwrite-strings to catch such mistakes. With this warning enabled, the type of string constants is changed to const char[] and will thus cause compiler warnings when being assigned to non-const fields and variables.
--- config.mak.dev | 1 + 1 file changed, 1 insertion(+)
config.mak.dev +1 -0
@@ -37,6 +37,7 @@ DEVELOPER_CFLAGS += -Wpointer-arith DEVELOPER_CFLAGS += -Wstrict-prototypes DEVELOPER_CFLAGS += -Wunused DEVELOPER_CFLAGS += -Wvla +DEVELOPER_CFLAGS += -Wwrite-strings DEVELOPER_CFLAGS += -fno-common ifneq ($(filter clang4,$(COMPILER_FEATURES)),)
Signature · 1 line
2.45.1.313.g3a57aa566a.dirty
Quoted 46 lines · Patrick Steinhardt
Hi,
there were some recent discussions about compiler warnings and how to stay on top of breaking changes in compilers in general [1] and about string constants in particular [2]. This made me look into what kind of warnings we should reasonably enable, which led me to the following list of warnings that may be sensible:
-
-Wformat-nonliteralto warn about non-constant strings being passed as format string.-
-Wwrite-stringsto warn about string constants being assigned to a non-constant variable.-
-Wredundant-declsto warn about redundant declarations.-
-Wconversionto warn about implicit integer casts when they may alter the value.This patch series adapts our code to compile with
-Wwrite-strings. This option will change the type of string constants fromchar []toconst char []such that it is now invalid to assign it to non-const variables without a cast. The intent is to avoid undefined behaviour when accedintally writing to such strings and to avoid free'ing such a variable.There are quite some cases where we mishandle this. Oftentimes we just didn't bother to free any memory at all, which made it a non-issue in the first place. Other times we had some special logic that prevents writing or freeing such strings. But in most cases it was an accident waiting to happen.
Even though the changes are quite invasive, I think that this is a step into the right direction. Many of the constructs feel quite fragile, and most of those get fixed in this series. Some others I just paper over, for example when assigning to structures with global lifetime where we know that they are never released at all.
I also have a patch series cooking for
-Wredundant-decls. But while that warning detects some redundant declarations indeed, it creates a problem withextern char **environ. There is no header for it and programs are asked to declare it by themselves. But of course, some libc implementations disagree and declare it. I haven't found a nice way to work around this issue, but may send the patches that drop the redundant declarations nonetheless.
Quoted 6 lines
The other two warnings I haven't yet looked into.
I ran some test jobs on both GitHub [3] and GitLab [4] to verify that the result is sane.
Thanks!
I forgot to say that this is based on top of 3a57aa566a (The eighth batch, 2024-05-28) with ps/leakfixes merged into it at ebdbefa4fe (builtin/mv: fix leaks for submodule gitfile paths, 2024-05-27).
Patrick
Re: [PATCH 01/19] global: improve const correctness when assigning string constants
In reply to Patrick SteinhardtQuoted 6 lines · Patrick Steinhardt
We're about to enable
-Wwrite-strings, which changes the type of string constants toconst char[]. Fix various sites where we assign such constants to non-const variables.Signed-off-by Patrick Steinhardt <[email protected]>---
This is a noisy change, and it is kind of surprising that ...
Quoted 5 lines
builtin/bisect.c +0
-0
builtin/bisect.c static int bisect_reset(const char *commit) · line 269
Quoted 9 lines
builtin/bisect.c +2
-1@@ -262,7 +262,8 @@ static int bisect_reset(const char *commit)return bisect_clean_state (); } -static void log_commit (FILE *fp,char *fmt,const char *state, +static void log_commit (FILE *fp, +const char *fmt,const char *state,struct commit *commit) {struct pretty_print_context pp = {0 };
... a change like this does not require any other change to the code inside the function (e.g., by making further cascading changes to what the function calls).
But applying this step alone and building would not give us any constness warning/error from the compiler, so the result looks good to the compiler, I guess?
Thanks.
Re: [PATCH 02/19] global: assign non-const strings as required
In reply to Patrick Steinhardtbuiltin/remote.c static int get_head_names(const struct ref *remote_refs, struct ref_states *stat · line 505
Quoted 10 lines · Patrick Steinhardt
builtin/remote.c +2
-1+char refspec_str[] ="refs/heads/*" ;memset (&refspec,0 ,sizeof (refspec)); refspec.force =0 ; refspec.pattern =1 ; - refspec.src = refspec.dst ="refs/heads/*" ; + refspec.src = refspec.dst = refspec_str;get_fetch_map (remote_refs, &refspec, &fetch_map_tail,0 ); matches =guess_remote_head (find_ref_by_name (remote_refs,"HEAD" ), fetch_map,1 );
I have no objections to changes along this line, but this makes me wonder if we somehow have ways to ensure that after everything is done, refspec_str[], empty_str[], and the like in other hunks remain to have their initial contents. Stepping back a bit, without applying this series, if we told the compiler to store these constant strings in read-only segment, any attempt to write into refspec.src or refspec.dst string would have been caught at runtime as an error. With the patch, that would no longer work. The piece of memory in refspec_str[] is a fair game to be overwritten by anybody.
Which makes me wonder why these refspec.src and refspec.dst members are not "const char *" pointers in the first place? Obviously we do not expect "refs/heads/*" to be overwritten after storing the pointer to it in these members and making the get_fetch_map() call.
Re: [PATCH 03/19] global: convert intentionally-leaking config strings to consts
In reply to Patrick SteinhardtQuoted 12 lines · Patrick Steinhardt
There are multiple cases where we intentionally leak config strings:
-
struct gpg_formatis used to track programs that can be used for signing commits, either via gpg(1), gpgsm(1) or ssh-keygen(1). The user can override the commands via several config variables. As the array is populated once, only, and will never be free'd, it is fine to treat the program as a quasi-constant.-
struct ll_merge_driveris used to track merge drivers. Same as with the GPG format, these drivers are populated once and then reused. Its data is never free'd, either.
Quoted 7 lines
-
struct userdiff_funcnameandstruct userdiff_drivercan be configured viadiff.<driver>.*to add additional drivers. Again, these have a global lifetime and are never free'd.All of these are intentionally kept alive and never free'd. Let's mark the respective fields as
const char *and cast away the constness when assigning those values.
It is not unclear where the linkage between "not freed" and "must be const" comes from. What am I missing?
Thanks.
Re: [PATCH 05/19] reftable: improve const correctness when assigning string constants
In reply to Patrick Steinhardtreftable/basics_test.c static void test_binsearch(void) · line 63
Quoted 13 lines · Patrick Steinhardt
reftable/basics_test.c +2
-2@@ -58,8 +58,8 @@ static void test_binsearch(void)static void test_names_length (void ) { -char *a[] = {"a" ,"b" ,NULL }; -EXPECT (names_length (a) ==2 ); +char *names[] = { (char *)"a" , (char *)"b" ,NULL }; +EXPECT (names_length (names) ==2 ); }
I would have preferred to see this kind of rewrite more than separate and clearly writable variables that are initialied with the constant contents e.g. branches[] = "refs/heads/*", we saw in earlier steps. Wouldn't that approach, combined with making the literal constants stored in read-only segment to trigger runtime failure when a bug causes the "unfortunately non-const" variables to be written, give us a better result?
Re: [PATCH 06/19] refspec: remove global tag refspec structure
In reply to Patrick Steinhardtrefspec.c line 18
Quoted 11 lines · Patrick Steinhardt
refspec.c +1
-9+refspec_item_init (&tag_refspec,TAG_REFSPEC ,0 ); -static struct refspec_item s_tag_refspec = { - .force =0 , - .pattern =1 , - .matching =0 , - .exact_sha1 =0 , - .negative =0 , - .src ="refs/tags/*" , - .dst ="refs/tags/*" , -};
Regardless of the constness issue, replacing these hardcoded initializer values that is an accident waiting to happen with a call to refspec_item_init() is very much welcomed.
Unless parse_refspec() is an immensely high cost operation, which it isn't.
Re: [PATCH 07/19] http: do not assign string constant to non-const field
In reply to Patrick SteinhardtQuoted 27 lines · Patrick Steinhardt
In
write_accept_language(), we put all acceptable languages into an array. While all entries in that array are allocated strings, the final entry in that array is a string constant. This is fine because we explicitly skip over the last entry when freeing the array, but will cause warnings once we enable-Wwrite-strings.Adapt the code to also allocate the final entry.
Signed-off-by Patrick Steinhardt <[email protected]>--- http.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)http.c +1
-1@@ -1974,7 +1974,7 @@ static void write_accept_language(struct strbuf *buf)/* add '*' */ REALLOC_ARRAY (language_tags, num_langs +1 ); - language_tags[num_langs++] ="*" ;/* it's OK; this won't be freed */ + language_tags[num_langs++] =xstrdup ("*" );/* compute decimal_places */ for (max_q = 1, decimal_places = 0;
http.c static void write_accept_language(struct strbuf *buf) · line 2010
Quoted 9 lines
http.c +1
-2@@ -2004,8 +2004,7 @@ static void write_accept_language(struct strbuf *buf) } } -/* free language tags -- last one is a static '*' */ -for (i =0 ; i < num_langs -1 ; i++) +for (i =0 ; i < num_langs; i++)free (language_tags[i]);free (language_tags); }
Makes sense, especially that this is done only once per process.
Re: [PATCH 08/19] line-log: always allocate the output prefix
In reply to Patrick SteinhardtQuoted 7 lines · Patrick Steinhardt
The returned string by
output_prefix()is sometimes a string constant and sometimes an allocated string. This has been fine until now because we always leak the allocated strings, and thus we never tried to free the string constant.Fix the code to always return an allocated string and free the returned value at all callsites.
Yay!
This leak always has bothered me, as it is not just once per process invocation, but once per each commit that is shown.
Re: [PATCH 09/19] object-file: make `buf` parameter of `index_mem()` a constant
In reply to Patrick SteinhardtQuoted 7 lines · Patrick Steinhardt
The
bufparameter ofindex_mem()is a non-constant string. This will break once we enable-Wwrite-stringsbecause we also pass constants from at least one callsite.Adapt the parameter to be a constant. As we cannot free the buffer without casting now, this also requires us to move the lifetime of the nested buffer around.
Makes sense.
Re: [PATCH 12/19] remote-curl: avoid assigning string constant to non-const variable
In reply to Patrick Steinhardtremote-curl.c int cmd_main(int argc, const char **argv) · line 1601
Quoted 12 lines · Patrick Steinhardt
remote-curl.c +8
-0}else if (skip_prefix (buf.buf,"option " , &arg)) { +const char *value =strchr (arg,' ' ); +size_t arglen;int result; +if (value) { + arglen = value - arg; + value++; + }else { + arglen =strlen (arg); value ="true" ; + }
There is a micro optimization opportunity here.
const char *value = strchrnul(arg, ' '); size_t arglen = value - arg; if (*value) value++; /* skip over SP */ else value = "true";
But other than that, very cleanly done.
Re: [PATCH 13/19] revision: always store allocated strings in output encoding
In reply to Patrick SteinhardtQuoted 13 lines · Patrick Steinhardt
The
git_log_output_encodingvariable can be set via the--encoding=option. When doing so, we conditionally either assign it to the passed value, or if the value is "none" we assign it the empty string. Depending on which of the both code paths we pick though, the variable may end up being assigned either an allocated string or a string constant.This is somewhat risky and may easily lead to bugs when a different code path may want to reassign a new value to it, freeing the previous value. We already to this when parsing the "i18n.logoutputencoding" config in
git_default_i18n_config(). But because the config is typically parsed before we parse command line options this has been fine so far.
Quoted 3 lines
Regardless of that, safeguard the code such that the variable always contains an allocated string. While at it, also free the old value in case there was any to plug a potential memory leak.
Nice. Now the thing always has to be freed once we are done. Consistency is good.
Re: [PATCH 16/19] imap-send: fix leaking memory in `imap_server_conf`
In reply to Patrick SteinhardtQuoted 3 lines · Patrick Steinhardt
We never free any of the config strings that we populate into the
struct imap_server_conf. Fix this by creating a common exit path where we can free resources.
This is more like the previous step got rid of the anchor that made these strings reachable, so we need to turn around to free them, which is sort-of Meh, especially given that the leaked pieces of memory are small and very much bounded.
The main benefit of this change is to allow us prepare on the constness change in the other (read: API this thing uses from elsewhere) parts of the system, which is a very worthy goal.
Quoted 2 lines
While at it, drop the unused variables
imap_server_conf::nameandnongit_ok.
The removal of the .name member may be correct, but I suspect the change to nongit_ok is a change in behaviour, and it could even be a regression.
imap-send.c int cmd_main(int argc, const char **argv) · line 1512
Quoted 2 lines
imap-send.c +1
-1-setup_git_directory_gently (&nongit_ok); +setup_git_directory_gently (NULL );
The general idea behind &nongit_ok is that
- Usually setup_git_directory_gently() dies if NULL is passed instead of a pointer to &nongit_ok. Most of the Git command wants to make sure they have a repository to operate on, so this is a reasonable default behaviour.
- Some commands would want to work also without having any repository, possibly with limited capability (e.g., "git apply" may want to work as a better "GNU patch", but obviously it cannot do "git apply --binary --3way" without having the object database). They tell setup_git_directory_gently() not to die when outside a repository by passing a pointer to &nongit_ok, and instead tell if we are in a repository by storing 0/1 in it.
The idea is that a command that is willing to work outside a repository can disable selected features based on what it sees in nongit_ok. In the case of "imap-send", there is no such features that it needs to special case, perhaps because everything it does is supposed to work outside a repository?
So the short version of what worries me in this change is that we used to be able to operate without having a repository at all, but now we would barf if run outside a repository, no?
Thanks.
Re: [PATCH 17/19] builtin/rebase: adapt code to not assign string constants to non-const
In reply to Patrick SteinhardtQuoted 6 lines · Patrick Steinhardt
When computing the rebase strategy we temporarily assign a string constant to
options.strategybefore we callxstrdup()on it. Furthermore, the default backend is being assigned a string constant viaREBASE_OPTIONS_INIT. Both of these will cause warnings once we enable-Wwrite-strings.
Quoted 7 lines
Adapt the code such that we only store allocated strings in those variables.
Signed-off-by Patrick Steinhardt <[email protected]>--- builtin/rebase.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
One gripe I have in this change is that it used to be crystal clear what the hardcoded default was (i.e. written in the initialization data), but now you have to follow the program flow to see what the hardcoded default is.
Quoted 8 lines
builtin/rebase.c +3
-1if (options.type ==REBASE_UNSPECIFIED ) { -if (!strcmp (options.default_backend,"merge" )) +if (!options.default_backend) + options.type =REBASE_MERGE ; +else if (!strcmp (options.default_backend,"merge" )) options.type =REBASE_MERGE ;else if (!strcmp (options.default_backend,"apply" )) options.type =REBASE_APPLY ;
Re: [PATCH 01/19] global: improve const correctness when assigning string constants
In reply to Junio C HamanoQuoted 30 lines · Junio C Hamano
Quoted 6 lines · Patrick Steinhardt
We're about to enable
-Wwrite-strings, which changes the type of string constants toconst char[]. Fix various sites where we assign such constants to non-const variables.Signed-off-by Patrick Steinhardt <[email protected]>---
This is a noisy change, and it is kind of surprising that ...
Quoted 5 lines
builtin/bisect.c +0
-0builtin/bisect.c static int bisect_reset(const char *commit) · line 269
Quoted 9 lines
builtin/bisect.c +2
-1@@ -262,7 +262,8 @@ static int bisect_reset(const char *commit)return bisect_clean_state (); } -static void log_commit (FILE *fp,char *fmt,const char *state, +static void log_commit (FILE *fp, +const char *fmt,const char *state,struct commit *commit) {struct pretty_print_context pp = {0 };... a change like this does not require any other change to the code inside the function (e.g., by making further cascading changes to what the function calls).
Quoted 3 lines
But applying this step alone and building would not give us any constness warning/error from the compiler, so the result looks good to the compiler, I guess?
Yup, any intermediate commit builds with DEVELOPER=1.
Patrick
Re: [PATCH 02/19] global: assign non-const strings as required
In reply to Junio C HamanoQuoted 15 lines · Junio C Hamano
builtin/remote.c static int get_head_names(const struct ref *remote_refs, struct ref_states *stat · line 505
Quoted 10 lines · Patrick Steinhardt
builtin/remote.c +2
-1+char refspec_str[] ="refs/heads/*" ;memset (&refspec,0 ,sizeof (refspec)); refspec.force =0 ; refspec.pattern =1 ; - refspec.src = refspec.dst ="refs/heads/*" ; + refspec.src = refspec.dst = refspec_str;get_fetch_map (remote_refs, &refspec, &fetch_map_tail,0 ); matches =guess_remote_head (find_ref_by_name (remote_refs,"HEAD" ), fetch_map,1 );I have no objections to changes along this line, but this makes me wonder if we somehow have ways to ensure that after everything is
Quoted 8 lines
done, refspec_str[], empty_str[], and the like in other hunks remain to have their initial contents. Stepping back a bit, without applying this series, if we told the compiler to store these constant strings in read-only segment, any attempt to write into refspec.src or refspec.dst string would have been caught at runtime as an error. With the patch, that would no longer work. The piece of memory in refspec_str[] is a fair game to be overwritten by anybody.
True. Ideally, we wouldn't have to do these acrobatics here in the first place. That would likely require quite a lot more work and go beyond the scope of this patch series.
Quoted 4 lines
Which makes me wonder why these refspec.src and refspec.dst members are not "const char *" pointers in the first place? Obviously we do not expect "refs/heads/*" to be overwritten after storing the pointer to it in these members and making the
get_fetch_map()call.
Well, we do. Not in get_fetch_map(), but in query_refspecs(). It does weird stuff where it writes the result into either src or dst depending on which of these fields is provided by the caller. Which means that one of the fields would typically be a constant, whereas the other one will be allocated.
Really, once you start looking you find all kinds of weird interfaces where we cannot quite make up our mind whether fields are controlled by the caller or by the callee. This patch series certainly surfaces quite some places that left me scratching my head.
Patrick
Re: [PATCH 03/19] global: convert intentionally-leaking config strings to consts
In reply to Junio C HamanoQuoted 18 lines · Junio C Hamano
Quoted 16 lines · Patrick Steinhardt
There are multiple cases where we intentionally leak config strings:
-
struct gpg_formatis used to track programs that can be used for signing commits, either via gpg(1), gpgsm(1) or ssh-keygen(1). The user can override the commands via several config variables. As the array is populated once, only, and will never be free'd, it is fine to treat the program as a quasi-constant.-
struct ll_merge_driveris used to track merge drivers. Same as with the GPG format, these drivers are populated once and then reused. Its data is never free'd, either.-
struct userdiff_funcnameandstruct userdiff_drivercan be configured viadiff.<driver>.*to add additional drivers. Again, these have a global lifetime and are never free'd.
Quoted 6 lines
Quoted 3 lines
All of these are intentionally kept alive and never free'd. Let's mark the respective fields as
const char *and cast away the constness when assigning those values.It is not unclear where the linkage between "not freed" and "must be const" comes from. What am I missing?
It comes from -Wwrite-strings, which will mark string constants as const char *. This will cause warnings in all of the above cases because the fields are being assigned constants, but those fields are currently char *. Will clarify.
Patrick
Re: [PATCH 05/19] reftable: improve const correctness when assigning string constants
In reply to Junio C HamanoQuoted 8 lines · Junio C Hamano
Quoted 6 lines · Patrick Steinhardt
reftable/basics_test.c +0
-0@@ -58,8 +58,8 @@ static void test_binsearch(void)
Quoted 15 lines
reftable/basics_test.c static void test_binsearch(void) · line 63
Quoted 7 lines
reftable/basics_test.c +2
-2static void test_names_length (void ) { -char *a[] = {"a" ,"b" ,NULL }; -EXPECT (names_length (a) ==2 ); +char *names[] = { (char *)"a" , (char *)"b" ,NULL }; +EXPECT (names_length (names) ==2 ); }I would have preferred to see this kind of rewrite more than separate and clearly writable variables that are initialied with the constant contents e.g. branches[] = "refs/heads/*", we saw in earlier steps. Wouldn't that approach, combined with making the literal constants stored in read-only segment to trigger runtime failure when a bug causes the "unfortunately non-const" variables to be written, give us a better result?
Depends on what we mean by "better", I guess. But yeah, I was torn myself when writing this commit because there are so many string constants in the reftable tests that we assign to non-constant fields. I didn't find the result particularly easy to read when putting each of the constants into a separate variable.
Revisiting this again though I don't think it's all that bad. I'll adapt accordingly.
Patrick
Re: [PATCH 12/19] remote-curl: avoid assigning string constant to non-const variable
In reply to Junio C HamanoQuoted 25 lines · Junio C Hamano
remote-curl.c int cmd_main(int argc, const char **argv) · line 1601
Quoted 12 lines · Patrick Steinhardt
remote-curl.c +8
-0}else if (skip_prefix (buf.buf,"option " , &arg)) { +const char *value =strchr (arg,' ' ); +size_t arglen;int result; +if (value) { + arglen = value - arg; + value++; + }else { + arglen =strlen (arg); value ="true" ; + }There is a micro optimization opportunity here.
const char *value = strchrnul(arg, ' '); size_t arglen = value - arg; if (*value) value++; /* skip over SP */ else value = "true";
Quoted 1 line
But other than that, very cleanly done.
Indeed, that version looks nicer. Thanks!
Patrick
Re: [PATCH 16/19] imap-send: fix leaking memory in `imap_server_conf`
In reply to Junio C HamanoQuoted 6 lines · Junio C Hamano
Quoted 3 lines · Patrick Steinhardt
We never free any of the config strings that we populate into the
struct imap_server_conf. Fix this by creating a common exit path where we can free resources.
Quoted 8 lines
This is more like the previous step got rid of the anchor that made these strings reachable, so we need to turn around to free them, which is sort-of Meh, especially given that the leaked pieces of memory are small and very much bounded.
The main benefit of this change is to allow us prepare on the constness change in the other (read: API this thing uses from elsewhere) parts of the system, which is a very worthy goal.
That's the motivation in this series at least. But I also see it as a good goal by itself to get rid of the global state that we had before the preceding patch. It may not be necessary, but it certainly helps me personally to reason about code better.
Quoted 31 lines
Quoted 2 lines
While at it, drop the unused variables
imap_server_conf::nameandnongit_ok.The removal of the .name member may be correct, but I suspect the change to
nongit_okis a change in behaviour, and it could even be a regression.imap-send.c int cmd_main(int argc, const char **argv) · line 1512
Quoted 2 lines
imap-send.c +1
-1-setup_git_directory_gently (&nongit_ok); +setup_git_directory_gently (NULL );The general idea behind
&nongit_okis that- Usually
setup_git_directory_gently()dies if NULL is passed instead of a pointer to&nongit_ok. Most of the Git command wants to make sure they have a repository to operate on, so this is a reasonable default behaviour.- Some commands would want to work also without having any repository, possibly with limited capability (e.g., "git apply" may want to work as a better "GNU patch", but obviously it cannot do "git apply --binary --3way" without having the object database). They tell
setup_git_directory_gently()not to die when outside a repository by passing a pointer to&nongit_ok, and instead tell if we are in a repository by storing 0/1 in it.The idea is that a command that is willing to work outside a repository can disable selected features based on what it sees in
nongit_ok. In the case of "imap-send", there is no such features that it needs to special case, perhaps because everything it does is supposed to work outside a repository?
Quoted 3 lines
So the short version of what worries me in this change is that we used to be able to operate without having a repository at all, but now we would barf if run outside a repository, no?
Oh, I wasn't aware that the parameter being NULL actually causes a change in behaviour. Which nicely demonstrates that we have some missing test coverage for git-imap-send(1).
In fact, it's not only "some". We don't have any test coverage at all for git-imap-send(1) as far as I can see. Which does make me rest a bit uneasy. And I suspect that it wouldn't be trivial to add given that it kind of requires something that talks IMAP on the receiving end.
Patrick
Re: [PATCH 17/19] builtin/rebase: adapt code to not assign string constants to non-const
In reply to Junio C HamanoQuoted 16 lines · Junio C Hamano
Quoted 6 lines · Patrick Steinhardt
When computing the rebase strategy we temporarily assign a string constant to
options.strategybefore we callxstrdup()on it. Furthermore, the default backend is being assigned a string constant viaREBASE_OPTIONS_INIT. Both of these will cause warnings once we enable-Wwrite-strings.Quoted 7 lines
Adapt the code such that we only store allocated strings in those variables.
Signed-off-by Patrick Steinhardt <[email protected]>--- builtin/rebase.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
Quoted 4 lines
One gripe I have in this change is that it used to be crystal clear what the hardcoded default was (i.e. written in the initialization data), but now you have to follow the program flow to see what the hardcoded default is.
True. We could adapt the macro to instead xstrdup() the default backend. But that feels a bit hidden, so I don't think this is a partiuclarly great option.
An alternative would be to wrap initialization into a function rebase_options_init() that instead allocates the default backend string. We can then also create a rebase_options_release() counter part that releases its resources such that this whole thing becomes a bit more self contained.
Patrick
v2 cover Compile with `-Wwrite-strings`
In reply to Patrick SteinhardtHi,
this is the second version of my patch series that prepares our code base to compile with -Wwrite-strings. This warning will convert the type of string constants from char [] to const char[] so that it becomes harder to for example write to or free such constants by accident.
Changes compared to v2:
- Merged the reftable-specific test into the second patch. Instead of adding casts, we now allocate the required strings on the stack.
- Apply a micro-optimization to "remote-curl.c" that was suggested by Junio.
- Restore the nongit_ok variable in "imap-send.c". It's somewhat concerning that we do not have test coverage for git-imap-send(1) at all. But it might be a bit more involved as we do not have any IMAP test infra, to the best of my knowledge.
- Rework the patch to "builtin/rebase.c". It is now split into two patches. The first patch reworks initialization of the rebase options so that the defaults are still self-contained in a single place. And the second patch refactors how we set up the merge strategy.
Thanks!
Patrick
Patrick Steinhardt (19):
global: improve const correctness when assigning string constants
global: assign non-const strings as required
global: convert intentionally-leaking config strings to consts compat/win32: fix const-correctness with string constants
refspec: remove global tag refspec structure
http: do not assign string constant to non-const field
line-log: always allocate the output prefix
object-file: make buf parameter of index_mem() a constant
parse-options: cast long name for OPTION_ALIAS
send-pack: always allocate receive status
remote-curl: avoid assigning string constant to non-const variable
revision: always store allocated strings in output encoding
mailmap: always store allocated strings in mailmap blob
imap-send: drop global imap_server_conf variable
imap-send: fix leaking memory in imap_server_conf builtin/rebase: do not assign default backend to non-constant field builtin/rebase: always store allocated string in options.strategy builtin/merge: always store allocated strings in pull_twohead config.mak.dev: enable -Wwrite-strings warning
builtin/bisect.c | 3 +- builtin/blame.c | 2 +- builtin/bugreport.c | 2 +- builtin/check-ignore.c | 4 +- builtin/clone.c | 14 ++-- builtin/commit.c | 6 +- builtin/diagnose.c | 2 +- builtin/fetch.c | 11 ++- builtin/log.c | 2 +- builtin/mailsplit.c | 4 +- builtin/merge.c | 18 +++-- builtin/pull.c | 52 +++++++------- builtin/rebase.c | 81 ++++++++++++---------- builtin/receive-pack.c | 4 +- builtin/remote.c | 3 +- builtin/revert.c | 2 +- builtin/send-pack.c | 2 + compat/basename.c | 15 +++- compat/mingw.c | 25 +++---- compat/regex/regcomp.c | 2 +- compat/winansi.c | 2 +- config.mak.dev | 1 + diff.c | 7 +- diffcore-rename.c | 6 +- entry.c | 7 +- fmt-merge-msg.c | 2 +- fsck.c | 2 +- fsck.h | 2 +- gpg-interface.c | 6 +- http-backend.c | 2 +- http.c | 5 +- ident.c | 9 ++- imap-send.c | 130 ++++++++++++++++++++--------------- line-log.c | 21 +++--- mailmap.c | 2 +- merge-ll.c | 11 ++- object-file.c | 17 ++--- parse-options.h | 2 +- pretty.c | 7 +- refs.c | 2 +- refs.h | 2 +- refs/reftable-backend.c | 5 +- refspec.c | 13 ---- refspec.h | 1 - reftable/basics_test.c | 5 +- reftable/block_test.c | 4 +- reftable/merged_test.c | 52 +++++++------- reftable/readwrite_test.c | 60 +++++++++------- reftable/record.c | 6 +- reftable/stack_test.c | 87 ++++++++++++----------- remote-curl.c | 53 +++++++------- revision.c | 3 +- run-command.c | 2 +- send-pack.c | 2 +- t/helper/test-hashmap.c | 3 +- t/helper/test-json-writer.c | 10 +-- t/helper/test-regex.c | 4 +- t/helper/test-rot13-filter.c | 5 +- t/t3900-i18n-commit.sh | 1 + t/t3901-i18n-patch.sh | 1 + t/unit-tests/t-strbuf.c | 10 +-- trailer.c | 2 +- userdiff.c | 10 +-- userdiff.h | 12 ++-- wt-status.c | 2 +- 65 files changed, 479 insertions(+), 373 deletions(-)
Range-diff against v1:
1: 25c31e550f = 1: 25c31e550f global: improve const correctness when assigning string constants
5: dc5d85257e ! 2: 3430bcc09b reftable: improve const correctness when assigning string constants
@@ Metadata
Author: Patrick Steinhardt <[email protected]>
## Commit message ##
- reftable: improve const correctness when assigning string constants
+ global: assign non-const strings as required
- There are many cases in the reftable tests where we assign string
- constants to non-const fields. This is harmless because we know that
- those fields are only used for reading access, but will break once we
- enable `-Wwrite-strings`. Add explicit casts to prepare for this.
+ There are several cases where we initialize non-const fields with string
+ constants. This is invalid and will cause warnings once we enable the
+ `-Wwrite-strings` warning. Adapt those cases to instead use string
+ arrays.
Signed-off-by: Patrick Steinhardt <[email protected]>
+ ## builtin/remote.c ##
+@@ builtin/remote.c: static int get_head_names(const struct ref *remote_refs, struct ref_states *stat
+ struct ref *ref, *matches;
+ struct ref *fetch_map = NULL, **fetch_map_tail = &fetch_map;
+ struct refspec_item refspec;
++ char refspec_str[] = "refs/heads/*";
+
+ memset(&refspec, 0, sizeof(refspec));
+ refspec.force = 0;
+ refspec.pattern = 1;
+- refspec.src = refspec.dst = "refs/heads/*";
++ refspec.src = refspec.dst = refspec_str;
+ get_fetch_map(remote_refs, &refspec, &fetch_map_tail, 0);
+ matches = guess_remote_head(find_ref_by_name(remote_refs, "HEAD"),
+ fetch_map, 1);
+
+ ## diff.c ##
+@@ diff.c: size_t fill_textconv(struct repository *r,
+ struct diff_filespec *df,
+ char **outbuf)
+ {
++ static char empty_str[] = "";
+ size_t size;
+
+ if (!driver) {
+ if (!DIFF_FILE_VALID(df)) {
+- *outbuf = "";
++ *outbuf = empty_str;
+ return 0;
+ }
+ if (diff_populate_filespec(r, df, NULL))
+
+ ## entry.c ##
+@@ entry.c: int finish_delayed_checkout(struct checkout *state, int show_progress)
+ struct string_list_item *filter, *path;
+ struct progress *progress = NULL;
+ struct delayed_checkout *dco = state->delayed_checkout;
++ char empty_str[] = "";
+
+ if (!state->delayed_checkout)
+ return errs;
+@@ entry.c: int finish_delayed_checkout(struct checkout *state, int show_progress)
+ if (!async_query_available_blobs(filter->string, &available_paths)) {
+ /* Filter reported an error */
+ errs = 1;
+- filter->string = "";
++ filter->string = empty_str;
+ continue;
+ }
+ if (available_paths.nr <= 0) {
+@@ entry.c: int finish_delayed_checkout(struct checkout *state, int show_progress)
+ * filter from the list (see
+ * "string_list_remove_empty_items" call below).
+ */
+- filter->string = "";
++ filter->string = empty_str;
+ continue;
+ }
+
+@@ entry.c: int finish_delayed_checkout(struct checkout *state, int show_progress)
+ * Do not ask the filter for available blobs,
+ * again, as the filter is likely buggy.
+ */
+- filter->string = "";
++ filter->string = empty_str;
+ continue;
+ }
+ ce = index_file_exists(state->istate, path->string,
+
+ ## ident.c ##
+@@ ident.c: static struct passwd *xgetpwuid_self(int *is_bogus)
+ pw = getpwuid(getuid());
+ if (!pw) {
+ static struct passwd fallback;
+- fallback.pw_name = "unknown";
++ static char fallback_name[] = "unknown";
+ #ifndef NO_GECOS_IN_PWENT
+- fallback.pw_gecos = "Unknown";
++ static char fallback_gcos[] = "Unknown";
++#endif
++
++ fallback.pw_name = fallback_name;
++#ifndef NO_GECOS_IN_PWENT
++ fallback.pw_gecos = fallback_gcos;
+ #endif
+ pw = &fallback;
+ if (is_bogus)
+
+ ## line-log.c ##
+@@ line-log.c: static int process_diff_filepair(struct rev_info *rev,
+ struct range_set tmp;
+ struct diff_ranges diff;
+ mmfile_t file_parent, file_target;
++ char empty_str[] = "";
+
+ assert(pair->two->path);
+ while (rg) {
+@@ line-log.c: static int process_diff_filepair(struct rev_info *rev,
+ file_parent.ptr = pair->one->data;
+ file_parent.size = pair->one->size;
+ } else {
+- file_parent.ptr = "";
++ file_parent.ptr = empty_str;
+ file_parent.size = 0;
+ }
+
+
+ ## object-file.c ##
+@@ object-file.c: static struct cached_object {
+ } *cached_objects;
+ static int cached_object_nr, cached_object_alloc;
+
++static char empty_tree_buf[] = "";
+ static struct cached_object empty_tree = {
+ .oid = {
+ .hash = EMPTY_TREE_SHA1_BIN_LITERAL,
+ },
+ .type = OBJ_TREE,
+- .buf = "",
++ .buf = empty_tree_buf,
+ };
+
+ static struct cached_object *find_cached_object(const struct object_id *oid)
+
+ ## pretty.c ##
+@@ pretty.c: static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
+ return 1;
+ case 'D':
+ {
++ char empty_str[] = "";
+ const struct decoration_options opts = {
+- .prefix = "",
+- .suffix = ""
++ .prefix = empty_str,
++ .suffix = empty_str,
+ };
+
+ format_decorations(sb, commit, c->auto_color, &opts);
+
+ ## refs/reftable-backend.c ##
+@@ refs/reftable-backend.c: static int write_copy_table(struct reftable_writer *writer, void *cb_data)
+ struct strbuf errbuf = STRBUF_INIT;
+ size_t logs_nr = 0, logs_alloc = 0, i;
+ const char *committer_info;
++ char head[] = "HEAD";
+ int ret;
+
+ committer_info = git_committer_info(0);
+@@ refs/reftable-backend.c: static int write_copy_table(struct reftable_writer *writer, void *cb_data)
+ if (append_head_reflog) {
+ ALLOC_GROW(logs, logs_nr + 1, logs_alloc);
+ logs[logs_nr] = logs[logs_nr - 1];
+- logs[logs_nr].refname = "HEAD";
++ logs[logs_nr].refname = head;
+ logs_nr++;
+ }
+ }
+@@ refs/reftable-backend.c: static int write_copy_table(struct reftable_writer *writer, void *cb_data)
+ string_list_clear(&skip, 0);
+ strbuf_release(&errbuf);
+ for (i = 0; i < logs_nr; i++) {
+- if (!strcmp(logs[i].refname, "HEAD"))
++ if (logs[i].refname == head)
+ continue;
+ logs[i].refname = NULL;
+ reftable_log_record_release(&logs[i]);
+
## reftable/basics_test.c ##
@@ reftable/basics_test.c: static void test_binsearch(void)
@@ reftable/basics_test.c: static void test_binsearch(void)
{
- char *a[] = { "a", "b", NULL };
- EXPECT(names_length(a) == 2);
-+ char *names[] = { (char *)"a", (char *)"b", NULL };
++ char a[] = "a", b[] = "b";
++ char *names[] = { a, b, NULL };
+ EXPECT(names_length(names) == 2);
}
static void test_parse_names_normal(void)
## reftable/block_test.c ##
+@@ reftable/block_test.c: license that can be found in the LICENSE file or at
+ static void test_block_read_write(void)
+ {
+ const int header_off = 21; /* random */
+- char *names[30];
++ char *names[30], empty_str[] = "";
+ const int N = ARRAY_SIZE(names);
+ const int block_size = 1024;
+ struct reftable_block block = { NULL };
@@ reftable/block_test.c: static void test_block_read_write(void)
block_writer_init(&bw, BLOCK_TYPE_REF, block.data, block_size,
header_off, hash_size(GIT_SHA1_FORMAT_ID));
- rec.u.ref.refname = "";
-+ rec.u.ref.refname = (char *)"";
++ rec.u.ref.refname = empty_str;
rec.u.ref.value_type = REFTABLE_REF_DELETION;
n = block_writer_add(&bw, &rec);
EXPECT(n == REFTABLE_API_ERROR);
## reftable/merged_test.c ##
@@ reftable/merged_test.c: static void readers_destroy(struct reftable_reader **readers, size_t n)
+
static void test_merged_between(void)
{
++ char a[] = "a", b[] = "b";
struct reftable_ref_record r1[] = { {
- .refname = "b",
-+ .refname = (char *)"b",
++ .refname = b,
.update_index = 1,
.value_type = REFTABLE_REF_VAL1,
.value.val1 = { 1, 2, 3, 0 },
} };
struct reftable_ref_record r2[] = { {
- .refname = "a",
-+ .refname = (char *)"a",
++ .refname = a,
.update_index = 2,
.value_type = REFTABLE_REF_DELETION,
} };
-@@ reftable/merged_test.c: static void test_merged(void)
+@@ reftable/merged_test.c: static void test_merged_between(void)
+
+ static void test_merged(void)
{
++ char a[] = "a", b[] = "b", c[] = "c", d[] = "d";
struct reftable_ref_record r1[] = {
{
- .refname = "a",
-+ .refname = (char *)"a",
++ .refname = a,
.update_index = 1,
.value_type = REFTABLE_REF_VAL1,
.value.val1 = { 1 },
},
{
- .refname = "b",
-+ .refname = (char *)"b",
++ .refname = b,
.update_index = 1,
.value_type = REFTABLE_REF_VAL1,
.value.val1 = { 1 },
},
{
- .refname = "c",
-+ .refname = (char *)"c",
++ .refname = c,
.update_index = 1,
.value_type = REFTABLE_REF_VAL1,
.value.val1 = { 1 },
@@ reftable/merged_test.c: static void test_merged(void)
};
struct reftable_ref_record r2[] = { {
- .refname = "a",
-+ .refname = (char *)"a",
++ .refname = a,
.update_index = 2,
.value_type = REFTABLE_REF_DELETION,
} };
struct reftable_ref_record r3[] = {
{
- .refname = "c",
-+ .refname = (char *)"c",
++ .refname = c,
.update_index = 3,
.value_type = REFTABLE_REF_VAL1,
.value.val1 = { 2 },
},
{
- .refname = "d",
-+ .refname = (char *)"d",
++ .refname = d,
.update_index = 3,
.value_type = REFTABLE_REF_VAL1,
.value.val1 = { 1 },
-@@ reftable/merged_test.c: static void test_merged_logs(void)
+@@ reftable/merged_test.c: merged_table_from_log_records(struct reftable_log_record **logs,
+
+ static void test_merged_logs(void)
{
++ char a[] = "a";
++ char name[] = "jane doe", email[] = "jane@invalid";
++ char message1[] = "message1", message2[] = "message2";
++ char message3[] = "message3";
struct reftable_log_record r1[] = {
{
- .refname = "a",
-+ .refname = (char *)"a",
++ .refname = a,
.update_index = 2,
.value_type = REFTABLE_LOG_UPDATE,
.value.update = {
@@ reftable/merged_test.c: static void test_merged_logs(void)
- .name = "jane doe",
- .email = "jane@invalid",
- .message = "message2",
-+ .name = (char *)"jane doe",
-+ .email = (char *)"jane@invalid",
-+ .message = (char *)"message2",
++ .name = name,
++ .email = email,
++ .message = message2,
}
},
{
- .refname = "a",
-+ .refname = (char *)"a",
++ .refname = a,
.update_index = 1,
.value_type = REFTABLE_LOG_UPDATE,
.value.update = {
@@ reftable/merged_test.c: static void test_merged_logs(void)
- .name = "jane doe",
- .email = "jane@invalid",
- .message = "message1",
-+ .name = (char *)"jane doe",
-+ .email = (char *)"jane@invalid",
-+ .message = (char *)"message1",
++ .name = name,
++ .email = email,
++ .message = message1,
}
},
};
struct reftable_log_record r2[] = {
{
- .refname = "a",
-+ .refname = (char *)"a",
++ .refname = a,
.update_index = 3,
.value_type = REFTABLE_LOG_UPDATE,
.value.update = {
@@ reftable/merged_test.c: static void test_merged_logs(void)
- .name = "jane doe",
- .email = "jane@invalid",
- .message = "message3",
-+ .name = (char *)"jane doe",
-+ .email = (char *)"jane@invalid",
-+ .message = (char *)"message3",
++ .name = name,
++ .email = email,
++ .message = message3,
}
},
};
struct reftable_log_record r3[] = {
{
- .refname = "a",
-+ .refname = (char *)"a",
++ .refname = a,
.update_index = 2,
.value_type = REFTABLE_LOG_DELETION,
},
-@@ reftable/merged_test.c: static void test_default_write_opts(void)
+@@ reftable/merged_test.c: static void test_merged_logs(void)
+
+ static void test_default_write_opts(void)
+ {
++ char master[] = "master";
+ struct reftable_write_options opts = { 0 };
struct strbuf buf = STRBUF_INIT;
struct reftable_writer *w =
reftable_new_writer(&strbuf_add_void, &noop_flush, &buf, &opts);
-
struct reftable_ref_record rec = {
- .refname = "master",
-+ .refname = (char *)"master",
++ .refname = master,
.update_index = 1,
};
int err;
## reftable/readwrite_test.c ##
+@@ reftable/readwrite_test.c: static void write_table(char ***names, struct strbuf *buf, int N,
+ int i = 0, n;
+ struct reftable_log_record log = { NULL };
+ const struct reftable_stats *stats = NULL;
++ char message[] = "message";
+
+ REFTABLE_CALLOC_ARRAY(*names, N + 1);
+
@@ reftable/readwrite_test.c: static void write_table(char ***names, struct strbuf *buf, int N,
log.update_index = update_index;
log.value_type = REFTABLE_LOG_UPDATE;
set_test_hash(log.value.update.new_hash, i);
- log.value.update.message = "message";
-+ log.value.update.message = (char *)"message";
++ log.value.update.message = message;
n = reftable_writer_add_log(w, &log);
EXPECT(n == 0);
-@@ reftable/readwrite_test.c: static void test_log_buffer_size(void)
+@@ reftable/readwrite_test.c: static void write_table(char ***names, struct strbuf *buf, int N,
+
+ static void test_log_buffer_size(void)
+ {
++ char refname[] = "refs/heads/master";
++ char name[] = "Han-Wen Hienhuys";
++ char email[] = "[email protected]";
++ char message[] = "commit: 9\n";
+ struct strbuf buf = STRBUF_INIT;
+ struct reftable_write_options opts = {
+ .block_size = 4096,
};
int err;
int i;
@@ reftable/readwrite_test.c: static void test_log_buffer_size(void)
- .message = "commit: 9\n",
- } } };
+ struct reftable_log_record log = {
-+ .refname = (char *)"refs/heads/master",
++ .refname = refname,
+ .update_index = 0xa,
+ .value_type = REFTABLE_LOG_UPDATE,
+ .value.update = {
-+ .name = (char *)"Han-Wen Nienhuys",
-+ .email = (char *)"[email protected]",
++ .name = name,
++ .email = email,
+ .tz_offset = 100,
+ .time = 0x5e430672,
-+ .message = (char *)"commit: 9\n",
++ .message = message,
+ },
+ };
struct reftable_writer *w =
reftable_new_writer(&strbuf_add_void, &noop_flush, &buf, &opts);
+@@ reftable/readwrite_test.c: static void test_log_buffer_size(void)
+
+ static void test_log_overflow(void)
+ {
++ char refname[] = "refs/heads/master";
++ char name[] = "Han-Wen Hienhuys";
++ char email[] = "[email protected]";
+ struct strbuf buf = STRBUF_INIT;
+ char msg[256] = { 0 };
+ struct reftable_write_options opts = {
@@ reftable/readwrite_test.c: static void test_log_overflow(void)
};
int err;
struct reftable_log_record log = {
- .refname = "refs/heads/master",
-+ .refname = (char *)"refs/heads/master",
++ .refname = refname,
.update_index = 0xa,
.value_type = REFTABLE_LOG_UPDATE,
.value = {
@@ reftable/readwrite_test.c: static void test_log_overflow(void)
.new_hash = { 2 },
- .name = "Han-Wen Nienhuys",
- .email = "[email protected]",
-+ .name = (char *)"Han-Wen Nienhuys",
-+ .email = (char *)"[email protected]",
++ .name = name,
++ .email = email,
.tz_offset = 100,
.time = 0x5e430672,
.message = msg,
@@ reftable/readwrite_test.c: static void test_log_zlib_corruption(void)
+ struct reftable_writer *w =
+ reftable_new_writer(&strbuf_add_void, &noop_flush, &buf, &opts);
+ const struct reftable_stats *stats = NULL;
++ char refname[] = "refname";
++ char name[] = "My Name";
++ char email[] = "myname@invalid";
char message[100] = { 0 };
int err, i, n;
struct reftable_log_record log = {
- .refname = "refname",
-+ .refname = (char *)"refname",
++ .refname = refname,
.value_type = REFTABLE_LOG_UPDATE,
.value = {
.update = {
@@ reftable/readwrite_test.c: static void test_log_zlib_corruption(void)
.old_hash = { 2 },
- .name = "My Name",
- .email = "myname@invalid",
-+ .name = (char *)"My Name",
-+ .email = (char *)"myname@invalid",
++ .name = name,
++ .email = email,
.message = message,
},
},
@@ reftable/readwrite_test.c: static void test_write_empty_key(void)
+ struct strbuf buf = STRBUF_INIT;
struct reftable_writer *w =
reftable_new_writer(&strbuf_add_void, &noop_flush, &buf, &opts);
++ char refname[] = "";
struct reftable_ref_record ref = {
- .refname = "",
-+ .refname = (char *)"",
++ .refname = refname,
.update_index = 1,
.value_type = REFTABLE_REF_DELETION,
};
@@ reftable/readwrite_test.c: static void test_write_key_order(void)
+ struct strbuf buf = STRBUF_INIT;
+ struct reftable_writer *w =
reftable_new_writer(&strbuf_add_void, &noop_flush, &buf, &opts);
++ char a[] = "a", b[] = "b", target[] = "target";
struct reftable_ref_record refs[2] = {
{
- .refname = "b",
-+ .refname = (char *)"b",
++ .refname = b,
.update_index = 1,
.value_type = REFTABLE_REF_SYMREF,
.value = {
- .symref = "target",
-+ .symref = (char *)"target",
++ .symref = target,
},
}, {
- .refname = "a",
-+ .refname = (char *)"a",
++ .refname = a,
.update_index = 1,
.value_type = REFTABLE_REF_SYMREF,
.value = {
- .symref = "target",
-+ .symref = (char *)"target",
++ .symref = target,
},
}
};
@@ reftable/stack_test.c: static void test_parse_names(void)
static int write_test_ref(struct reftable_writer *wr, void *arg)
@@ reftable/stack_test.c: static void test_reftable_stack_add_one(void)
+ };
struct reftable_stack *st = NULL;
int err;
++ char head[] = "HEAD", master[] = "master";
struct reftable_ref_record ref = {
- .refname = "HEAD",
-+ .refname = (char *)"HEAD",
++ .refname = head,
.update_index = 1,
.value_type = REFTABLE_REF_SYMREF,
- .value.symref = "master",
-+ .value.symref = (char *)"master",
++ .value.symref = master,
};
struct reftable_ref_record dest = { NULL };
struct stat stat_result = { 0 };
@@ reftable/stack_test.c: static void test_reftable_stack_uptodate(void)
+ char *dir = get_tmp_dir(__LINE__);
int err;
++ char head[] = "HEAD", branch2[] = "branch2", master[] = "master";
struct reftable_ref_record ref1 = {
- .refname = "HEAD",
-+ .refname = (char *)"HEAD",
++ .refname = head,
.update_index = 1,
.value_type = REFTABLE_REF_SYMREF,
- .value.symref = "master",
-+ .value.symref = (char *)"master",
++ .value.symref = master,
};
struct reftable_ref_record ref2 = {
- .refname = "branch2",
-+ .refname = (char *)"branch2",
++ .refname = branch2,
.update_index = 2,
.value_type = REFTABLE_REF_SYMREF,
- .value.symref = "master",
-+ .value.symref = (char *)"master",
++ .value.symref = master,
};
@@ reftable/stack_test.c: static void test_reftable_stack_transaction_api(void)
+ struct reftable_stack *st = NULL;
+ int err;
struct reftable_addition *add = NULL;
-
+-
++ char head[] = "HEAD", master[] = "master";
struct reftable_ref_record ref = {
- .refname = "HEAD",
-+ .refname = (char *)"HEAD",
++ .refname = head,
.update_index = 1,
.value_type = REFTABLE_REF_SYMREF,
- .value.symref = "master",
-+ .value.symref = (char *)"master",
++ .value.symref = master,
};
struct reftable_ref_record dest = { NULL };
@@ reftable/stack_test.c: static void test_reftable_stack_transaction_api_performs_auto_compaction(void)
+ EXPECT_ERR(err);
+
+ for (i = 0; i <= n; i++) {
++ char master[] = "master";
struct reftable_ref_record ref = {
.update_index = reftable_stack_next_update_index(st),
.value_type = REFTABLE_REF_SYMREF,
- .value.symref = "master",
-+ .value.symref = (char *)"master",
++ .value.symref = master,
};
char name[100];
@@ reftable/stack_test.c: static void test_reftable_stack_transaction_api_performs_auto_compaction(void)
+
static void test_reftable_stack_auto_compaction_fails_gracefully(void)
{
++ char master[] = "refs/meads/master";
struct reftable_ref_record ref = {
- .refname = "refs/heads/master",
-+ .refname = (char *)"refs/heads/master",
++ .refname = master,
.update_index = 1,
.value_type = REFTABLE_REF_VAL1,
.value.val1 = {0x01},
-@@ reftable/stack_test.c: static void test_reftable_stack_update_index_check(void)
+@@ reftable/stack_test.c: static int write_error(struct reftable_writer *wr, void *arg)
+ static void test_reftable_stack_update_index_check(void)
+ {
+ char *dir = get_tmp_dir(__LINE__);
+-
+ struct reftable_write_options cfg = { 0 };
struct reftable_stack *st = NULL;
int err;
++ char name1[] = "name1", name2[] = "name2", master[] = "master";
struct reftable_ref_record ref1 = {
- .refname = "name1",
-+ .refname = (char *)"name1",
++ .refname = name1,
.update_index = 1,
.value_type = REFTABLE_REF_SYMREF,
- .value.symref = "master",
-+ .value.symref = (char *)"master",
++ .value.symref = master,
};
struct reftable_ref_record ref2 = {
- .refname = "name2",
-+ .refname = (char *)"name2",
++ .refname = name2,
.update_index = 1,
.value_type = REFTABLE_REF_SYMREF,
- .value.symref = "master",
-+ .value.symref = (char *)"master",
++ .value.symref = master,
};
err = reftable_new_stack(&st, dir, cfg);
@@ reftable/stack_test.c: static void test_reftable_stack_log_normalize(void)
+ };
struct reftable_stack *st = NULL;
char *dir = get_tmp_dir(__LINE__);
++ char branch[] = "branch";
++ char onetwomessage[] = "one\ntwo";
++ char onemessage[] = "one";
++ char twomessage[] = "two\n";
struct reftable_log_record input = {
- .refname = "branch",
-+ .refname = (char *)"branch",
++ .refname = branch,
.update_index = 1,
.value_type = REFTABLE_LOG_UPDATE,
.value = {
@@ reftable/stack_test.c: static void test_reftable_stack_log_normalize(void)
EXPECT_ERR(err);
- input.value.update.message = "one\ntwo";
-+ input.value.update.message = (char *)"one\ntwo";
++ input.value.update.message = onetwomessage;
err = reftable_stack_add(st, &write_test_log, &arg);
EXPECT(err == REFTABLE_API_ERROR);
- input.value.update.message = "one";
-+ input.value.update.message = (char *)"one";
++ input.value.update.message = onemessage;
err = reftable_stack_add(st, &write_test_log, &arg);
EXPECT_ERR(err);
@@ reftable/stack_test.c: static void test_reftable_stack_log_normalize(void)
EXPECT(0 == strcmp(dest.value.update.message, "one\n"));
- input.value.update.message = "two\n";
-+ input.value.update.message = (char *)"two\n";
++ input.value.update.message = twomessage;
arg.update_index = 2;
err = reftable_stack_add(st, &write_test_log, &arg);
EXPECT_ERR(err);
-@@ reftable/stack_test.c: static void test_reftable_stack_hash_id(void)
+@@ reftable/stack_test.c: static void test_reftable_stack_tombstone(void)
+ static void test_reftable_stack_hash_id(void)
+ {
+ char *dir = get_tmp_dir(__LINE__);
+-
+ struct reftable_write_options cfg = { 0 };
+ struct reftable_stack *st = NULL;
int err;
-
+-
++ char master[] = "master", target[] = "target";
struct reftable_ref_record ref = {
- .refname = "master",
-+ .refname = (char *)"master",
++ .refname = master,
.value_type = REFTABLE_REF_SYMREF,
- .value.symref = "target",
-+ .value.symref = (char *)"target",
++ .value.symref = target,
.update_index = 1,
};
struct reftable_write_options cfg32 = { .hash_id = GIT_SHA256_FORMAT_ID };
@@ reftable/stack_test.c: static void test_reftable_stack_auto_compaction(void)
+ EXPECT_ERR(err);
+
+ for (i = 0; i < N; i++) {
+- char name[100];
++ char name[100], master[] = "master";
+ struct reftable_ref_record ref = {
.refname = name,
.update_index = reftable_stack_next_update_index(st),
.value_type = REFTABLE_REF_SYMREF,
- .value.symref = "master",
-+ .value.symref = (char *)"master",
++ .value.symref = master,
};
snprintf(name, sizeof(name), "branch%04d", i);
@@ reftable/stack_test.c: static void test_reftable_stack_add_performs_auto_compaction(void)
+ EXPECT_ERR(err);
+
+ for (i = 0; i <= n; i++) {
++ char master[] = "master";
struct reftable_ref_record ref = {
.update_index = reftable_stack_next_update_index(st),
.value_type = REFTABLE_REF_SYMREF,
- .value.symref = "master",
-+ .value.symref = (char *)"master",
++ .value.symref = master,
};
/*
@@ reftable/stack_test.c: static void test_reftable_stack_compaction_concurrent(void)
+ EXPECT_ERR(err);
+
+ for (i = 0; i < N; i++) {
+- char name[100];
++ char name[100], master[] = "master";
+ struct reftable_ref_record ref = {
.refname = name,
.update_index = reftable_stack_next_update_index(st1),
.value_type = REFTABLE_REF_SYMREF,
- .value.symref = "master",
-+ .value.symref = (char *)"master",
++ .value.symref = master,
};
snprintf(name, sizeof(name), "branch%04d", i);
@@ reftable/stack_test.c: static void test_reftable_stack_compaction_concurrent_clean(void)
+ EXPECT_ERR(err);
+
+ for (i = 0; i < N; i++) {
+- char name[100];
++ char name[100], master[] = "master";
+ struct reftable_ref_record ref = {
.refname = name,
.update_index = reftable_stack_next_update_index(st1),
.value_type = REFTABLE_REF_SYMREF,
- .value.symref = "master",
-+ .value.symref = (char *)"master",
++ .value.symref = master,
};
snprintf(name, sizeof(name), "branch%04d", i); 3: 8f3decbb76 ! 3: 8b71dfa208 global: convert intentionally-leaking config strings to consts
@@ Commit message
configured via diff.<driver>.* to add additional drivers. Again, these have a global lifetime and are never free'd.
- All of these are intentionally kept alive and never free'd. Let's mark
- the respective fields as const char * and cast away the constness when
- assigning those values.
+ All of these are intentionally kept alive and never free'd. Furthermore,
+ all of these are being assigned both string constants in some places,
+ and allocated strings in other places. This will cause warnings once we
+ enable -Wwrite-strings, so let's mark the respective fields as `const
+ char *` and cast away the constness when assigning those values.
4: ba50e49f86 = 4: 961b3357d5 compat/win32: fix const-correctness with string constants
6: 0eaa73c109 = 5: b73a45133b refspec: remove global tag refspec structure
7: 03b13c449b = 6: 6da87a0905 http: do not assign string constant to non-const field
8: 699eeae92c = 7: 3da7df97a5 line-log: always allocate the output prefix
9: 6cbb8444a6 = 8: e5d14a5173 object-file: make `buf` parameter of `index_mem()` a constant
10: c07b27bbb4 = 9: dd40c7464d parse-options: cast long name for OPTION_ALIAS
11: 3cd28ae38c = 10: 462502127d send-pack: always allocate receive status
12: 00b4a7dbbc ! 11: 884fbe1da5 remote-curl: avoid assigning string constant to non-const variable
@@ remote-curl.c: int cmd_main(int argc, const char **argv)
} else if (skip_prefix(buf.buf, "option ", &arg)) {
- char *value = strchr(arg, ' ');
-+ const char *value = strchr(arg, ' ');
-+ size_t arglen;
++ const char *value = strchrnul(arg, ' ');
++ size_t arglen = value - arg;
int result;
- if (value)
- *value++ = '\0';
-- else
-+ if (value) {
-+ arglen = value - arg;
-+ value++;
-+ } else {
-+ arglen = strlen(arg);
++ if (*value)
++ value++; /* skip over SP */
+ else
value = "true";
-+ }
- result = set_option(arg, value);
+ result = set_option(arg, arglen, value);
13: 68a7d24e4a = 12: 502380c2ca revision: always store allocated strings in output encoding
14: 0e393fa6a7 = 13: ffacdc3779 mailmap: always store allocated strings in mailmap blob
15: 18ba9f7b3b = 14: c0fce9b87e imap-send: drop global `imap_server_conf` variable
16: 357d69fa8b ! 15: e0a5b83f0e imap-send: fix leaking memory in `imap_server_conf` @@ Commit message
struct imap_server_conf. Fix this by creating a common exit path where we can free resources.
- While at it, drop the unused variables imap_server_conf::name and
- nongit_ok.
+ While at it, drop the unused member imap_server_conf::name.
@@ imap-send.c: static int git_imap_config(const char *var, const char *val,
return 0;
}
@@ imap-send.c: int cmd_main(int argc, const char **argv)
- };
struct strbuf all_msgs = STRBUF_INIT;
int total;
-- int nongit_ok;
+ int nongit_ok;
+ int ret;
-- setup_git_directory_gently(&nongit_ok);
-+ setup_git_directory_gently(NULL);
+ setup_git_directory_gently(&nongit_ok);
git_config(git_imap_config, &server);
-
- argc = parse_options(argc, (const char **)argv, "", imap_send_options, imap_send_usage, 0);
@@ imap-send.c: int cmd_main(int argc, const char **argv)
if (!server.folder) {
2: 51ee5660a1 ! 16: 36a7b0a4b0 global: assign non-const strings as required
@@ Metadata
Author: Patrick Steinhardt <[email protected]>
## Commit message ##
- global: assign non-const strings as required
+ builtin/rebase: do not assign default backend to non-constant field
- There are several cases where we initialize non-const fields with string
- constants. This is invalid and will cause warnings once we enable the
- -Wwrite-strings warning. Adapt those cases to instead use string
- arrays.
+ The struct rebase_options::default_backend field is a non-constant
+ string, but is being assigned a constant via REBASE_OPTIONS_INIT.
+ Refactor the code to initialize and release options via two functions
+ rebase_options_init() and rebase_options_release(). Like this, we
+ can easily adapt the former funnction to use xstrdup() on the default
+ value without hiding it away in a macro.
- ## builtin/remote.c ##
-@@ builtin/remote.c: static int get_head_names(const struct ref *remote_refs, struct ref_states *stat
- struct ref *ref, *matches;
- struct ref *fetch_map = NULL, **fetch_map_tail = &fetch_map;
- struct refspec_item refspec;
-+ char refspec_str[] = "refs/heads/*";
-
- memset(&refspec, 0, sizeof(refspec));
- refspec.force = 0;
- refspec.pattern = 1;
-- refspec.src = refspec.dst = "refs/heads/*";
-+ refspec.src = refspec.dst = refspec_str;
- get_fetch_map(remote_refs, &refspec, &fetch_map_tail, 0);
- matches = guess_remote_head(find_ref_by_name(remote_refs, "HEAD"),
- fetch_map, 1);
-
- ## diff.c ##
-@@ diff.c: size_t fill_textconv(struct repository *r,
- struct diff_filespec *df,
- char **outbuf)
- {
-+ static char empty_str[] = "";
- size_t size;
-
- if (!driver) {
- if (!DIFF_FILE_VALID(df)) {
-- *outbuf = "";
-+ *outbuf = empty_str;
- return 0;
- }
- if (diff_populate_filespec(r, df, NULL))
-
- ## entry.c ##
-@@ entry.c: int finish_delayed_checkout(struct checkout *state, int show_progress)
- struct string_list_item *filter, *path;
- struct progress *progress = NULL;
- struct delayed_checkout *dco = state->delayed_checkout;
-+ char empty_str[] = "";
-
- if (!state->delayed_checkout)
- return errs;
-@@ entry.c: int finish_delayed_checkout(struct checkout *state, int show_progress)
- if (!async_query_available_blobs(filter->string, &available_paths)) {
- /* Filter reported an error */
- errs = 1;
-- filter->string = "";
-+ filter->string = empty_str;
- continue;
- }
- if (available_paths.nr <= 0) {
-@@ entry.c: int finish_delayed_checkout(struct checkout *state, int show_progress)
- * filter from the list (see
- * "string_list_remove_empty_items" call below).
- */
-- filter->string = "";
-+ filter->string = empty_str;
- continue;
- }
+ ## builtin/rebase.c ##
+@@ builtin/rebase.c: struct rebase_options {
+ int config_update_refs;
+ };
-@@ entry.c: int finish_delayed_checkout(struct checkout *state, int show_progress)
- * Do not ask the filter for available blobs,
- * again, as the filter is likely buggy.
- */
-- filter->string = "";
-+ filter->string = empty_str;
- continue;
- }
- ce = index_file_exists(state->istate, path->string,
-
- ## ident.c ##
-@@ ident.c: static struct passwd *xgetpwuid_self(int *is_bogus)
- pw = getpwuid(getuid());
- if (!pw) {
- static struct passwd fallback;
-- fallback.pw_name = "unknown";
-+ static char fallback_name[] = "unknown";
- #ifndef NO_GECOS_IN_PWENT
-- fallback.pw_gecos = "Unknown";
-+ static char fallback_gcos[] = "Unknown";
-+#endif
+-#define REBASE_OPTIONS_INIT { \
+- .type = REBASE_UNSPECIFIED, \
+- .empty = EMPTY_UNSPECIFIED, \
+- .keep_empty = 1, \
+- .default_backend = "merge", \
+- .flags = REBASE_NO_QUIET, \
+- .git_am_opts = STRVEC_INIT, \
+- .exec = STRING_LIST_INIT_NODUP, \
+- .git_format_patch_opt = STRBUF_INIT, \
+- .fork_point = -1, \
+- .reapply_cherry_picks = -1, \
+- .allow_empty_message = 1, \
+- .autosquash = -1, \
+- .rebase_merges = -1, \
+- .config_rebase_merges = -1, \
+- .update_refs = -1, \
+- .config_update_refs = -1, \
+- .strategy_opts = STRING_LIST_INIT_NODUP,\
+- }
++static void rebase_options_init(struct rebase_options *opts)
++{
++ memset(opts, 0, sizeof(*opts));
++ opts->type = REBASE_UNSPECIFIED;
++ opts->empty = EMPTY_UNSPECIFIED;
++ opts->default_backend = xstrdup("merge");
++ opts->keep_empty = 1;
++ opts->flags = REBASE_NO_QUIET;
++ strvec_init(&opts->git_am_opts);
++ string_list_init_nodup(&opts->exec);
++ strbuf_init(&opts->git_format_patch_opt, 0);
++ opts->fork_point = -1;
++ opts->reapply_cherry_picks = -1;
++ opts->allow_empty_message = 1;
++ opts->autosquash = -1;
++ opts->rebase_merges = -1;
++ opts->config_rebase_merges = -1;
++ opts->update_refs = -1;
++ opts->config_update_refs = -1;
++ string_list_init_nodup(&opts->strategy_opts);
++}
+
-+ fallback.pw_name = fallback_name;
-+#ifndef NO_GECOS_IN_PWENT
-+ fallback.pw_gecos = fallback_gcos;
- #endif
- pw = &fallback;
- if (is_bogus)
-
- ## line-log.c ##
-@@ line-log.c: static int process_diff_filepair(struct rev_info *rev,
- struct range_set tmp;
- struct diff_ranges diff;
- mmfile_t file_parent, file_target;
-+ char empty_str[] = "";
++static void rebase_options_release(struct rebase_options *opts)
++{
++ free(opts->default_backend);
++ free(opts->reflog_action);
++ free(opts->head_name);
++ strvec_clear(&opts->git_am_opts);
++ free(opts->gpg_sign_opt);
++ string_list_clear(&opts->exec, 0);
++ free(opts->strategy);
++ string_list_clear(&opts->strategy_opts, 0);
++ strbuf_release(&opts->git_format_patch_opt);
++}
- assert(pair->two->path);
- while (rg) {
-@@ line-log.c: static int process_diff_filepair(struct rev_info *rev,
- file_parent.ptr = pair->one->data;
- file_parent.size = pair->one->size;
- } else {
-- file_parent.ptr = "";
-+ file_parent.ptr = empty_str;
- file_parent.size = 0;
+ static struct replay_opts get_replay_opts(const struct rebase_options *opts)
+ {
+@@ builtin/rebase.c: static int rebase_config(const char *var, const char *value,
}
-
- ## object-file.c ##
-@@ object-file.c: static struct cached_object {
- } *cached_objects;
- static int cached_object_nr, cached_object_alloc; -
-+static char empty_tree_buf[] = "";
- static struct cached_object empty_tree = {
- .oid = {
- .hash = EMPTY_TREE_SHA1_BIN_LITERAL,
- },
- .type = OBJ_TREE,
-- .buf = "",
-+ .buf = empty_tree_buf,
- };
+ if (!strcmp(var, "rebase.backend")) {
++ FREE_AND_NULL(opts->default_backend);
+ return git_config_string(&opts->default_backend, var, value);
+ }
- static struct cached_object *find_cached_object(const struct object_id *oid) -
- ## pretty.c ##
-@@ pretty.c: static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
- return 1;
- case 'D':
- {
-+ char empty_str[] = "";
- const struct decoration_options opts = {
-- .prefix = "",
-- .suffix = ""
-+ .prefix = empty_str,
-+ .suffix = empty_str,
- };
+@@ builtin/rebase.c: static int check_exec_cmd(const char *cmd)
- format_decorations(sb, commit, c->auto_color, &opts);
-
- ## refs/reftable-backend.c ##
-@@ refs/reftable-backend.c: static int write_copy_table(struct reftable_writer *writer, void *cb_data)
- struct strbuf errbuf = STRBUF_INIT;
- size_t logs_nr = 0, logs_alloc = 0, i;
- const char *committer_info;
-+ char head[] = "HEAD";
- int ret;
+ int cmd_rebase(int argc, const char **argv, const char *prefix)
+ {
+- struct rebase_options options = REBASE_OPTIONS_INIT;
++ struct rebase_options options;
+ const char *branch_name;
+ int ret, flags, total_argc, in_progress = 0;
+ int keep_base = 0;
+@@ builtin/rebase.c: int cmd_rebase(int argc, const char **argv, const char *prefix)
+ };
+ int i;
- committer_info = git_committer_info(0);
-@@ refs/reftable-backend.c: static int write_copy_table(struct reftable_writer *writer, void *cb_data)
- if (append_head_reflog) {
- ALLOC_GROW(logs, logs_nr + 1, logs_alloc);
- logs[logs_nr] = logs[logs_nr - 1];
-- logs[logs_nr].refname = "HEAD";
-+ logs[logs_nr].refname = head;
- logs_nr++;
- }
- }
-@@ refs/reftable-backend.c: static int write_copy_table(struct reftable_writer *writer, void *cb_data)
- string_list_clear(&skip, 0);
- strbuf_release(&errbuf);
- for (i = 0; i < logs_nr; i++) {
-- if (!strcmp(logs[i].refname, "HEAD"))
-+ if (logs[i].refname == head)
- continue;
- logs[i].refname = NULL;
- reftable_log_record_release(&logs[i]);
++ rebase_options_init(&options);
++
+ if (argc == 2 && !strcmp(argv[1], "-h"))
+ usage_with_options(builtin_rebase_usage,
+ builtin_rebase_options);
+@@ builtin/rebase.c: int cmd_rebase(int argc, const char **argv, const char *prefix)
+ cleanup:
+ strbuf_release(&buf);
+ strbuf_release(&revisions);
+- free(options.reflog_action);
+- free(options.head_name);
+- strvec_clear(&options.git_am_opts);
+- free(options.gpg_sign_opt);
+- string_list_clear(&options.exec, 0);
+- free(options.strategy);
+- string_list_clear(&options.strategy_opts, 0);
+- strbuf_release(&options.git_format_patch_opt);
++ rebase_options_release(&options);
+ free(squash_onto_name);
+ free(keep_base_onto_name);
+ return !!ret;
17: 16d3d28243 ! 17: 3552ab9748 builtin/rebase: adapt code to not assign string constants to non-const
@@ Metadata
Author: Patrick Steinhardt <[email protected]>
## Commit message ##
- builtin/rebase: adapt code to not assign string constants to non-const
+ builtin/rebase: always store allocated string in options.strategy
- When computing the rebase strategy we temporarily assign a string
- constant to options.strategy before we call xstrdup() on it.
- Furthermore, the default backend is being assigned a string constant via
- REBASE_OPTIONS_INIT. Both of these will cause warnings once we enable
- -Wwrite-strings.
+ The struct rebase_options::strategy field is a char *, but we do end
+ up assigning string constants to it in two cases:
- Adapt the code such that we only store allocated strings in those
- variables.
+ - When being passed a --strategy= option via the command line.
+
+ - When being passed a strategy option via --strategy-option=, but
+ not a strategy.
+
+ This will cause warnings once we enable -Wwrite-strings.
+
+ Ideally, we'd just convert the field to be a const char *. But we also
+ assign to this field via the GIT_TEST_MERGE_ALGORITHM envvar, which we
+ have to strdup(3P) into it.
+
+ Instead, refactor the code to make sure that we only ever assign
+ allocated strings to this field.
## builtin/rebase.c ##
-@@ builtin/rebase.c: struct rebase_options {
- .type = REBASE_UNSPECIFIED, \
- .empty = EMPTY_UNSPECIFIED, \
- .keep_empty = 1, \
-- .default_backend = "merge", \
- .flags = REBASE_NO_QUIET, \
- .git_am_opts = STRVEC_INIT, \
- .exec = STRING_LIST_INIT_NODUP, \
-@@ builtin/rebase.c: static int rebase_config(const char *var, const char *value,
- }
-
- if (!strcmp(var, "rebase.backend")) {
-+ FREE_AND_NULL(opts->default_backend);
- return git_config_string(&opts->default_backend, var, value);
- }
-
@@ builtin/rebase.c: int cmd_rebase(int argc, const char **argv, const char *prefix)
+ {
+ struct rebase_options options;
+ const char *branch_name;
++ const char *strategy_opt = NULL;
+ int ret, flags, total_argc, in_progress = 0;
+ int keep_base = 0;
+ int ok_to_skip_pre_rebase = 0;
+@@ builtin/rebase.c: int cmd_rebase(int argc, const char **argv, const char *prefix)
+ PARSE_OPT_OPTARG, parse_opt_rebase_merges),
+ OPT_BOOL(0, "fork-point", &options.fork_point,
+ N_("use 'merge-base --fork-point' to refine upstream")),
+- OPT_STRING('s', "strategy", &options.strategy,
++ OPT_STRING('s', "strategy", &strategy_opt,
+ N_("strategy"), N_("use the given merge strategy")),
+ OPT_STRING_LIST('X', "strategy-option", &options.strategy_opts,
+ N_("option"),
+@@ builtin/rebase.c: int cmd_rebase(int argc, const char **argv, const char *prefix)
+ }
}
- if (options.strategy_opts.nr && !options.strategy)
+- if (options.strategy_opts.nr && !options.strategy)
- options.strategy = "ort";
-
- if (options.strategy) {
- options.strategy = xstrdup(options.strategy);
++ if (strategy_opt)
++ options.strategy = xstrdup(strategy_opt);
++ else if (options.strategy_opts.nr && !options.strategy)
+ options.strategy = xstrdup("ort");
-+ else
-+ options.strategy = xstrdup_or_null(options.strategy);
+ if (options.strategy)
imply_merge(&options, "--strategy");
- }
if (options.root && !options.onto_name)
imply_merge(&options, "--root without --onto");
-@@ builtin/rebase.c: int cmd_rebase(int argc, const char **argv, const char *prefix)
- }
-
- if (options.type == REBASE_UNSPECIFIED) {
-- if (!strcmp(options.default_backend, "merge"))
-+ if (!options.default_backend)
-+ options.type = REBASE_MERGE;
-+ else if (!strcmp(options.default_backend, "merge"))
- options.type = REBASE_MERGE;
- else if (!strcmp(options.default_backend, "apply"))
- options.type = REBASE_APPLY;
-@@ builtin/rebase.c: int cmd_rebase(int argc, const char **argv, const char *prefix)
- cleanup:
- strbuf_release(&buf);
- strbuf_release(&revisions);
-+ free(options.default_backend);
- free(options.reflog_action);
- free(options.head_name);
- strvec_clear(&options.git_am_opts);
18: 129482dbaa = 18: bf854b3979 builtin/merge: always store allocated strings in `pull_twohead` 19: 37e7aaed97 = 19: 9b9d57ae84 config.mak.dev: enable `-Wwrite-strings` warning
Signature · 1 line
2.45.1.313.g3a57aa566a.dirty
PATCH v2 1/19 global: improve const correctness when assigning string constants
We're about to enable -Wwrite-strings, which changes the type of string constants to const char[]. Fix various sites where we assign such constants to non-const variables.
--- builtin/bisect.c | 3 ++- builtin/blame.c | 2 +- builtin/bugreport.c | 2 +- builtin/check-ignore.c | 4 +-- builtin/clone.c | 6 ++--- builtin/commit.c | 6 ++--- builtin/diagnose.c | 2 +- builtin/log.c | 2 +- builtin/mailsplit.c | 4 +-- builtin/pull.c | 52 ++++++++++++++++++------------------ builtin/receive-pack.c | 4 +-- builtin/revert.c | 2 +- compat/regex/regcomp.c | 2 +- diff.c | 4 +-- diffcore-rename.c | 6 ++--- fmt-merge-msg.c | 2 +- fsck.c | 2 +- fsck.h | 2 +- gpg-interface.c | 2 +- http-backend.c | 2 +- imap-send.c | 6 ++--- pretty.c | 2 +- refs.c | 2 +- refs.h | 2 +- reftable/record.c | 6 ++--- run-command.c | 2 +- t/helper/test-hashmap.c | 3 ++- t/helper/test-json-writer.c | 10 +++---- t/helper/test-regex.c | 4 +-- t/helper/test-rot13-filter.c | 5 ++-- t/unit-tests/t-strbuf.c | 10 ++++--- trailer.c | 2 +- wt-status.c | 2 +- 33 files changed, 86 insertions(+), 81 deletions(-)
builtin/bisect.c +2 -1
@@ -262,7 +262,8 @@ static int bisect_reset(const char *commit)return bisect_clean_state (); } -static void log_commit (FILE *fp,char *fmt,const char *state, +static void log_commit (FILE *fp, +const char *fmt,const char *state,struct commit *commit) {struct pretty_print_context pp = {0 };
builtin/blame.c +1 -1
@@ -134,7 +134,7 @@ static void get_ac_line(const char *inbuf, const char *what, {struct ident_split ident;size_t len, maillen, namelen; -char *tmp, *endp; +const char *tmp, *endp;const char *namebuf, *mailbuf; tmp =strstr (inbuf, what);
builtin/bugreport.c +1 -1
@@ -107,7 +107,7 @@ int cmd_bugreport(int argc, const char **argv, const char *prefix)struct tm tm;enum diagnose_mode diagnose =DIAGNOSE_NONE ;char *option_output =NULL ; -char *option_suffix ="%Y-%m-%d-%H%M" ; +const char *option_suffix ="%Y-%m-%d-%H%M" ;const char *user_relative_path =NULL ;char *prefixed_filename;size_t output_path_len;
builtin/check-ignore.c +2 -2
@@ -35,8 +35,8 @@ static const struct option check_ignore_options[] = {static void output_pattern (const char *path,struct path_pattern *pattern) { -char *bang = (pattern && pattern->flags &PATTERN_FLAG_NEGATIVE ) ?"!" :"" ; -char *slash = (pattern && pattern->flags &PATTERN_FLAG_MUSTBEDIR ) ?"/" :"" ; +const char *bang = (pattern && pattern->flags &PATTERN_FLAG_NEGATIVE ) ?"!" :"" ; +const char *slash = (pattern && pattern->flags &PATTERN_FLAG_MUSTBEDIR ) ?"/" :"" ;if (!nul_term_line) {if (!verbose) {write_name_quoted (path, stdout,'\n' );
builtin/clone.c +3 -3
@@ -71,7 +71,7 @@ static char *option_branch = NULL;static struct string_list option_not =STRING_LIST_INIT_NODUP ;static const char *real_git_dir;static const char *ref_format; -static char *option_upload_pack ="git-upload-pack" ; +static const char *option_upload_pack ="git-upload-pack" ;static int option_verbosity;static int option_progress =-1 ;static int option_sparse_checkout;
@@ -177,8 +177,8 @@ static struct option builtin_clone_options[] = {static const char *get_repo_path_1 (struct strbuf *path,int *is_bundle) { -static char *suffix[] = {"/.git" ,"" ,".git/.git" ,".git" }; -static char *bundle_suffix[] = {".bundle" ,"" }; +static const char *suffix[] = {"/.git" ,"" ,".git/.git" ,".git" }; +static const char *bundle_suffix[] = {".bundle" ,"" };size_t baselen = path->len;struct stat st;int i;
builtin/commit.c +3 -3
@@ -113,7 +113,7 @@ static char *template_file;* the commit message and/or authorship. */ static const char *author_message, *author_message_buffer; -static char *edit_message, *use_message; +static const char *edit_message, *use_message;static char *fixup_message, *fixup_commit, *squash_message;static const char *fixup_prefix;static int all, also, interactive, patch_interactive, only, amend, signoff;
@@ -121,8 +121,8 @@ static int edit_flag = -1; /* unspecified */static int quiet, verbose, no_verify, allow_empty, dry_run, renew_authorship;static int config_commit_verbose =-1 ;/* unspecified */ static int no_post_rewrite, allow_empty_message, pathspec_file_nul; -static char *untracked_files_arg, *force_date, *ignore_submodule_arg, *ignored_arg; -static char *sign_commit, *pathspec_from_file; +static const char *untracked_files_arg, *force_date, *ignore_submodule_arg, *ignored_arg; +static const char *sign_commit, *pathspec_from_file;static struct strvec trailer_args =STRVEC_INIT ;/*
builtin/diagnose.c +1 -1
@@ -18,7 +18,7 @@ int cmd_diagnose(int argc, const char **argv, const char *prefix)struct tm tm;enum diagnose_mode mode =DIAGNOSE_STATS ;char *option_output =NULL ; -char *option_suffix ="%Y-%m-%d-%H%M" ; +const char *option_suffix ="%Y-%m-%d-%H%M" ;char *prefixed_filename;const struct option diagnose_options[] = {
builtin/log.c +1 -1
@@ -1283,7 +1283,7 @@ static void get_patch_ids(struct rev_info *rev, struct patch_ids *ids) o2->flags = flags2; } -static void gen_message_id (struct rev_info *info,char *base) +static void gen_message_id (struct rev_info *info,const char *base) {struct strbuf buf =STRBUF_INIT ; strbuf_addf(&buf, "%s.%"PRItime".git.%s", base,
builtin/mailsplit.c +2 -2
@@ -113,8 +113,8 @@ static int populate_maildir_list(struct string_list *list, const char *path)DIR *dir;struct dirent *dent;char *name =NULL ; -char *subs[] = {"cur" ,"new" ,NULL }; -char **sub; +const char *subs[] = {"cur" ,"new" ,NULL }; +const char **sub;int ret =-1 ;for (sub = subs; *sub; ++sub) {
builtin/pull.c +26 -26
74 lines not on this page · raw message
builtin/receive-pack.c +2 -2
@@ -1249,7 +1249,7 @@ static int run_proc_receive_hook(struct command *commands,return code; } -static char *refuse_unconfigured_deny_msg = +static const char *refuse_unconfigured_deny_msg =N_ ("By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" "with what you pushed, and will require 'git reset --hard' to match\n"
@@ -1269,7 +1269,7 @@ static void refuse_unconfigured_deny(void)rp_error ("%s" ,_ (refuse_unconfigured_deny_msg)); } -static char *refuse_unconfigured_deny_delete_current_msg = +static const char *refuse_unconfigured_deny_delete_current_msg =N_ ("By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" "\n"
builtin/revert.c +1 -1
@@ -179,7 +179,7 @@ static int run_sequencer(int argc, const char **argv, const char *prefix,/* Check for incompatible command line arguments */ if (cmd) { -char *this_operation; +const char *this_operation;if (cmd =='q' ) this_operation ="--quit" ;else if (cmd =='c' )
compat/regex/regcomp.c +1 -1
@@ -848,7 +848,7 @@ init_dfa (re_dfa_t *dfa, size_t pat_len) {unsigned int table_size;#ifndef _LIBC -char *codeset_name; +const char *codeset_name;#endif memset (dfa,'\0' ,sizeof (re_dfa_t));
diff.c +2 -2
@@ -3764,7 +3764,7 @@ static void builtin_diff(const char *name_a,return ; } -static char *get_compact_summary (const struct diff_filepair *p,int is_renamed) +static const char *get_compact_summary (const struct diff_filepair *p,int is_renamed) {if (!is_renamed) {if (p->status ==DIFF_STATUS_ADDED ) {
@@ -4076,7 +4076,7 @@ static int reuse_worktree_file(struct index_state *istate,static int diff_populate_gitlink (struct diff_filespec *s,int size_only) {struct strbuf buf =STRBUF_INIT ; -char *dirty ="" ; +const char *dirty ="" ;/* Are we looking at the work tree? */ if (s->dirty_submodule)
diffcore-rename.c +3 -3
@@ -406,7 +406,7 @@ static const char *get_highest_rename_path(struct strintmap *counts)return highest_destination_dir; } -static char *UNKNOWN_DIR ="/" ;/* placeholder -- short, illegal directory */ +static const char *UNKNOWN_DIR ="/" ;/* placeholder -- short, illegal directory */ static int dir_rename_already_determinable (struct strintmap *counts) {
@@ -429,8 +429,8 @@ static int dir_rename_already_determinable(struct strintmap *counts) }static void increment_count (struct dir_rename_info *info, -char *old_dir, -char *new_dir) +const char *old_dir, +const char *new_dir) {struct strintmap *counts;struct strmap_entry *e;
fmt-merge-msg.c +1 -1
@@ -447,7 +447,7 @@ static void fmt_merge_msg_title(struct strbuf *out, const char *current_branch) {int i =0 ; -char *sep ="" ; +const char *sep ="" ;strbuf_addstr (out,"Merge " );for (i =0 ; i < srcs.nr; i++) {
fsck.c +1 -1
@@ -1231,7 +1231,7 @@ int fsck_object(struct object *obj, void *data, unsigned long size, }int fsck_buffer (const struct object_id *oid,enum object_type type, -void *data,unsigned long size, +const void *data,unsigned long size,struct fsck_options *options) {if (type ==OBJ_BLOB )
fsck.h +1 -1
@@ -202,7 +202,7 @@ int fsck_object(struct object *obj, void *data, unsigned long size,* struct. */ int fsck_buffer (const struct object_id *oid,enum object_type , -void *data,unsigned long size, +const void *data,unsigned long size,struct fsck_options *options);/*
gpg-interface.c +1 -1
@@ -727,7 +727,7 @@ static int git_gpg_config(const char *var, const char *value, void *cb UNUSED) {struct gpg_format *fmt =NULL ; -char *fmtname =NULL ; +const char *fmtname =NULL ;char *trust;int ret;
http-backend.c +1 -1
@@ -753,7 +753,7 @@ static int bad_request(struct strbuf *hdr, const struct service_cmd *c) int cmd_main(int argc UNUSED, const char **argv UNUSED) { -char *method =getenv ("REQUEST_METHOD" ); +const char *method =getenv ("REQUEST_METHOD" );const char *proto_header;char *dir;struct service_cmd *cmd =NULL ;
imap-send.c +3 -3
@@ -1215,9 +1215,9 @@ static int imap_store_msg(struct imap_store *ctx, struct strbuf *msg)static void wrap_in_html (struct strbuf *msg) {struct strbuf buf =STRBUF_INIT ; -static char *content_type ="Content-Type: text/html;\n" ; -static char *pre_open ="<pre>\n" ; -static char *pre_close ="</pre>\n" ; +static const char *content_type ="Content-Type: text/html;\n" ; +static const char *pre_open ="<pre>\n" ; +static const char *pre_close ="</pre>\n" ;const char *body =strstr (msg->buf,"\n\n" );if (!body)
pretty.c +1 -1
@@ -1325,7 +1325,7 @@ int format_set_trailers_options(struct process_trailer_options *opts, static size_t parse_describe_args(const char *start, struct strvec *args) { struct { - char *name; + const char *name; enum { DESCRIBE_ARG_BOOL, DESCRIBE_ARG_INTEGER,
refs.c +1 -1
@@ -159,7 +159,7 @@ void update_ref_namespace(enum ref_namespace namespace, char *ref) {struct ref_namespace_info *info = &ref_namespace[namespace];if (info->ref_updated) -free (info->ref); +free ((char *)info->ref); info->ref = ref; info->ref_updated =1 ; }
refs.h +1 -1
@@ -975,7 +975,7 @@ struct ref_store *get_worktree_ref_store(const struct worktree *wt);*/ struct ref_namespace_info { -char *ref; +const char *ref;enum decoration_type decoration;/*
reftable/record.c +3 -3
@@ -116,7 +116,7 @@ static int decode_string(struct strbuf *dest, struct string_view in)return start_len - in.len; } -static int encode_string (char *str,struct string_view s) +static int encode_string (const char *str,struct string_view s) {struct string_view start = s;int l =strlen (str);
@@ -969,9 +969,9 @@ static int reftable_log_record_decode(void *rec, struct strbuf key,return REFTABLE_FORMAT_ERROR ; } -static int null_streq (char *a,char *b) +static int null_streq (const char *a,const char *b) { -char *empty ="" ; +const char *empty ="" ;if (!a) a = empty;
run-command.c +1 -1
@@ -663,7 +663,7 @@ int start_command(struct child_process *cmd)int need_in, need_out, need_err;int fdin[2 ], fdout[2 ], fderr[2 ];int failed_errno; -char *str; +const char *str;/* * In case of errors we must keep the promise to close FDs
t/helper/test-hashmap.c +2 -1
@@ -36,7 +36,8 @@ static int test_entry_cmp(const void *cmp_data, }static struct test_entry *alloc_test_entry (unsigned int hash, -char *key,char *value) +const char *key, +const char *value) {size_t klen =strlen (key);size_t vlen =strlen (value);
t/helper/test-json-writer.c +5 -5
@@ -174,7 +174,7 @@ static void make_arr4(int pretty)jw_end (&arr4); } -static char *expect_nest1 = +static const char *expect_nest1 ="{\"obj1\":{\"a\":\"abc\",\"b\":42,\"c\":true},\"arr1\":[\"abc\",42,true]}" ;static struct json_writer nest1 =JSON_WRITER_INIT ;
@@ -195,10 +195,10 @@ static void make_nest1(int pretty)jw_release (&arr1); } -static char *expect_inline1 = +static const char *expect_inline1 ="{\"obj1\":{\"a\":\"abc\",\"b\":42,\"c\":true},\"arr1\":[\"abc\",42,true]}" ; -static char *pretty_inline1 = +static const char *pretty_inline1 = ("{\n" " \"obj1\": {\n" " \"a\": \"abc\",\n"
@@ -236,10 +236,10 @@ static void make_inline1(int pretty)jw_end (&inline1); } -static char *expect_inline2 = +static const char *expect_inline2 ="[[1,2],[3,4],{\"a\":\"abc\"}]" ; -static char *pretty_inline2 = +static const char *pretty_inline2 = ("[\n" " [\n" " 1,\n"
t/helper/test-regex.c +2 -2
@@ -20,8 +20,8 @@ static struct reg_flag reg_flags[] = {static int test_regex_bug (void ) { -char *pat ="[^={} \t]+" ; -char *str ="={}\nfred" ; +const char *pat ="[^={} \t]+" ; +const char *str ="={}\nfred" ;regex_t r;regmatch_t m[1 ];
t/helper/test-rot13-filter.c +3 -2
@@ -136,7 +136,7 @@ static void free_delay_entries(void)strmap_clear (&delay,0 ); } -static void add_delay_entry (char *pathname,int count,int requested) +static void add_delay_entry (const char *pathname,int count,int requested) {struct delay_entry *entry =xcalloc (1 ,sizeof (*entry)); entry->count = count;
@@ -189,7 +189,8 @@ static void reply_list_available_blobs_cmd(void)static void command_loop (void ) {for (;;) { -char *buf, *output; +char *buf; +const char *output;char *pathname;struct delay_entry *entry;struct strbuf input =STRBUF_INIT ;
t/unit-tests/t-strbuf.c +6 -4
@@ -2,7 +2,8 @@#include "strbuf.h" /* wrapper that supplies tests with an empty, initialized strbuf */ -static void setup (void (*f)(struct strbuf *,void *),void *data) +static void setup (void (*f)(struct strbuf *,const void *), +const void *data) {struct strbuf buf =STRBUF_INIT ;
@@ -13,7 +14,8 @@ static void setup(void (*f)(struct strbuf*, void*), void *data) }/* wrapper that supplies tests with a populated, initialized strbuf */ -static void setup_populated (void (*f)(struct strbuf *,void *),char *init_str,void *data) +static void setup_populated (void (*f)(struct strbuf *,const void *), +const char *init_str,const void *data) {struct strbuf buf =STRBUF_INIT ;
@@ -64,7 +66,7 @@ static void t_dynamic_init(void)strbuf_release (&buf); } -static void t_addch (struct strbuf *buf,void *data) +static void t_addch (struct strbuf *buf,const void *data) {const char *p_ch = data;const char ch = *p_ch;
@@ -83,7 +85,7 @@ static void t_addch(struct strbuf *buf, void *data) check_char(buf->buf[buf->len], ==, '\0'); } -static void t_addstr (struct strbuf *buf,void *data) +static void t_addstr (struct strbuf *buf,const void *data) {const char *text = data;size_t len =strlen (text);
trailer.c +1 -1
@@ -63,7 +63,7 @@ struct arg_item {static LIST_HEAD (conf_head); -static char *separators =":" ; +static const char *separators =":" ;static int configured;
wt-status.c +1 -1
@@ -2408,7 +2408,7 @@ static void wt_porcelain_v2_print_unmerged_entry(int mode;struct object_id oid; } stages[3 ]; -char *key; +const char *key;char submodule_token[5 ];char unmerged_prefix ='u' ;char eol_char = s->null_termination ?'\0' :'\n' ;
Signature · 1 line
2.45.1.313.g3a57aa566a.dirty
PATCH v2 2/19 global: assign non-const strings as required
In reply to Patrick SteinhardtThere are several cases where we initialize non-const fields with string constants. This is invalid and will cause warnings once we enable the -Wwrite-strings warning. Adapt those cases to instead use string arrays.
--- builtin/remote.c | 3 +- diff.c | 3 +- entry.c | 7 ++-- ident.c | 9 +++- line-log.c | 3 +- object-file.c | 3 +- pretty.c | 5 ++- refs/reftable-backend.c | 5 ++- reftable/basics_test.c | 5 ++- reftable/block_test.c | 4 +- reftable/merged_test.c | 52 ++++++++++++----------- reftable/readwrite_test.c | 60 ++++++++++++++++----------- reftable/stack_test.c | 87 +++++++++++++++++++++------------------ 13 files changed, 144 insertions(+), 102 deletions(-)
builtin/remote.c +2 -1
@@ -494,11 +494,12 @@ static int get_head_names(const struct ref *remote_refs, struct ref_states *statstruct ref *ref, *matches;struct ref *fetch_map =NULL , **fetch_map_tail = &fetch_map;struct refspec_item refspec; +char refspec_str[] ="refs/heads/*" ;memset (&refspec,0 ,sizeof (refspec)); refspec.force =0 ; refspec.pattern =1 ; - refspec.src = refspec.dst ="refs/heads/*" ; + refspec.src = refspec.dst = refspec_str;get_fetch_map (remote_refs, &refspec, &fetch_map_tail,0 ); matches =guess_remote_head (find_ref_by_name (remote_refs,"HEAD" ), fetch_map,1 );
diff.c +2 -1
@@ -7231,11 +7231,12 @@ size_t fill_textconv(struct repository *r,struct diff_filespec *df, char **outbuf) { + static char empty_str[] = "";size_t size;if (!driver) {if (!DIFF_FILE_VALID (df)) { - *outbuf ="" ; + *outbuf = empty_str;return 0 ; }if (diff_populate_filespec (r, df,NULL ))
entry.c +4 -3
@@ -175,6 +175,7 @@ int finish_delayed_checkout(struct checkout *state, int show_progress)struct string_list_item *filter, *path;struct progress *progress =NULL ;struct delayed_checkout *dco = state->delayed_checkout; +char empty_str[] ="" ;if (!state->delayed_checkout)return errs;
@@ -189,7 +190,7 @@ int finish_delayed_checkout(struct checkout *state, int show_progress)if (!async_query_available_blobs (filter->string, &available_paths)) {/* Filter reported an error */ errs =1 ; - filter->string ="" ; + filter->string = empty_str;continue ; }if (available_paths.nr <=0 ) {
@@ -199,7 +200,7 @@ int finish_delayed_checkout(struct checkout *state, int show_progress)* filter from the list (see * "string_list_remove_empty_items" call below). */ - filter->string ="" ; + filter->string = empty_str;continue ; }
@@ -225,7 +226,7 @@ int finish_delayed_checkout(struct checkout *state, int show_progress)* Do not ask the filter for available blobs, * again, as the filter is likely buggy. */ - filter->string ="" ; + filter->string = empty_str;continue ; } ce = index_file_exists(state->istate, path->string,
ident.c +7 -2
@@ -46,9 +46,14 @@ static struct passwd *xgetpwuid_self(int *is_bogus) pw =getpwuid (getuid ());if (!pw) {static struct passwd fallback; - fallback.pw_name ="unknown" ; +static char fallback_name[] ="unknown" ;#ifndef NO_GECOS_IN_PWENT - fallback.pw_gecos ="Unknown" ; +static char fallback_gcos[] ="Unknown" ; +#endif + + fallback.pw_name = fallback_name; +#ifndef NO_GECOS_IN_PWENT + fallback.pw_gecos = fallback_gcos;#endif pw = &fallback;if (is_bogus)
line-log.c +2 -1
@@ -1032,6 +1032,7 @@ static int process_diff_filepair(struct rev_info *rev,struct range_set tmp;struct diff_ranges diff;mmfile_t file_parent, file_target; +char empty_str[] ="" ;assert (pair->two->path);while (rg) {
@@ -1056,7 +1057,7 @@ static int process_diff_filepair(struct rev_info *rev, file_parent.ptr = pair->one->data; file_parent.size = pair->one->size; }else { - file_parent.ptr ="" ; + file_parent.ptr = empty_str; file_parent.size =0 ; }
object-file.c +2 -1
@@ -282,12 +282,13 @@ static struct cached_object { } *cached_objects;static int cached_object_nr, cached_object_alloc; +static char empty_tree_buf[] ="" ;static struct cached_object empty_tree = { .oid = { .hash =EMPTY_TREE_SHA1_BIN_LITERAL , }, .type =OBJ_TREE , - .buf ="" , + .buf = empty_tree_buf, };static struct cached_object *find_cached_object (const struct object_id *oid)
pretty.c +3 -2
@@ -1583,9 +1583,10 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */return 1 ;case 'D' : { +char empty_str[] ="" ;const struct decoration_options opts = { - .prefix ="" , - .suffix ="" + .prefix = empty_str, + .suffix = empty_str, };format_decorations (sb, commit, c->auto_color, &opts);
refs/reftable-backend.c +3 -2
@@ -1285,6 +1285,7 @@ static int write_copy_table(struct reftable_writer *writer, void *cb_data)struct strbuf errbuf =STRBUF_INIT ;size_t logs_nr =0 , logs_alloc =0 , i;const char *committer_info; +char head[] ="HEAD" ;int ret; committer_info =git_committer_info (0 );
@@ -1387,7 +1388,7 @@ static int write_copy_table(struct reftable_writer *writer, void *cb_data)if (append_head_reflog) {ALLOC_GROW (logs, logs_nr +1 , logs_alloc); logs[logs_nr] = logs[logs_nr -1 ]; - logs[logs_nr].refname ="HEAD" ; + logs[logs_nr].refname = head; logs_nr++; } }
@@ -1463,7 +1464,7 @@ static int write_copy_table(struct reftable_writer *writer, void *cb_data)string_list_clear (&skip,0 );strbuf_release (&errbuf);for (i =0 ; i < logs_nr; i++) { -if (!strcmp (logs[i].refname,"HEAD" )) +if (logs[i].refname == head)continue ; logs[i].refname =NULL ;reftable_log_record_release (&logs[i]);
reftable/basics_test.c +3 -2
@@ -58,8 +58,9 @@ static void test_binsearch(void)static void test_names_length (void ) { -char *a[] = {"a" ,"b" ,NULL }; -EXPECT (names_length (a) ==2 ); +char a[] ="a" , b[] ="b" ; +char *names[] = { a, b,NULL }; +EXPECT (names_length (names) ==2 ); }static void test_parse_names_normal (void )
reftable/block_test.c +2 -2
@@ -19,7 +19,7 @@ license that can be found in the LICENSE file or atstatic void test_block_read_write (void ) {const int header_off =21 ;/* random */ -char *names[30 ]; +char *names[30 ], empty_str[] ="" ;const int N =ARRAY_SIZE (names);const int block_size =1024 ;struct reftable_block block = {NULL };
@@ -42,7 +42,7 @@ static void test_block_read_write(void)block_writer_init (&bw,BLOCK_TYPE_REF , block.data, block_size, header_off,hash_size (GIT_SHA1_FORMAT_ID )); - rec.u.ref.refname ="" ; + rec.u.ref.refname = empty_str; rec.u.ref.value_type =REFTABLE_REF_DELETION ; n =block_writer_add (&bw, &rec);EXPECT (n ==REFTABLE_API_ERROR );
reftable/merged_test.c +29 -23
144 lines not on this page · raw message
reftable/readwrite_test.c +37 -23
139 lines not on this page · raw message
reftable/stack_test.c +48 -39
234 lines not on this page · raw message
Signature · 1 line
2.45.1.313.g3a57aa566a.dirty
PATCH v2 3/19 global: convert intentionally-leaking config strings to consts
In reply to Patrick SteinhardtThere are multiple cases where we intentionally leak config strings:
- struct gpg_format is used to track programs that can be used for signing commits, either via gpg(1), gpgsm(1) or ssh-keygen(1). The user can override the commands via several config variables. As the array is populated once, only, and will never be free'd, it is fine to treat the program as a quasi-constant.
- struct ll_merge_driver is used to track merge drivers. Same as with the GPG format, these drivers are populated once and then reused. Its data is never free'd, either.
- struct userdiff_funcname and struct userdiff_driver can be configured via diff.<driver>.* to add additional drivers. Again, these have a global lifetime and are never free'd.
All of these are intentionally kept alive and never free'd. Furthermore, all of these are being assigned both string constants in some places, and allocated strings in other places. This will cause warnings once we enable -Wwrite-strings, so let's mark the respective fields as const char * and cast away the constness when assigning those values.
--- gpg-interface.c | 4 ++-- merge-ll.c | 11 ++++++++--- userdiff.c | 10 +++++----- userdiff.h | 12 ++++++------ 4 files changed, 21 insertions(+), 16 deletions(-)
gpg-interface.c +2 -2
@@ -34,7 +34,7 @@ static enum signature_trust_level configured_min_trust_level = TRUST_UNDEFINED;struct gpg_format {const char *name; -char *program; +const char *program;const char **verify_args;const char **sigs; int (*verify_signed_buffer)(struct signature_check *sigc,
@@ -783,7 +783,7 @@ static int git_gpg_config(const char *var, const char *value,if (fmtname) { fmt =get_format_by_name (fmtname); -return git_config_string (&fmt->program, var, value); +return git_config_string ((char **) &fmt->program, var, value); }return 0 ;
merge-ll.c +8 -3
@@ -27,7 +27,7 @@ typedef enum ll_merge_result (*ll_merge_fn)(const struct ll_merge_driver *,struct ll_merge_driver {const char *name; -char *description; +const char *description;ll_merge_fn fn;char *recursive;struct ll_merge_driver *next;
@@ -304,8 +304,13 @@ static int read_merge_config(const char *var, const char *value, ll_user_merge_tail = &(fn->next); } -if (!strcmp ("name" , key)) -return git_config_string (&fn->description, var, value); +if (!strcmp ("name" , key)) { +/* +* The description is leaking, but that's okay as we want to +* keep around the merge drivers anyway. +*/ +return git_config_string ((char **) &fn->description, var, value); + }if (!strcmp ("driver" , key)) {if (!value)
userdiff.c +5 -5
@@ -399,7 +399,7 @@ static struct userdiff_driver *userdiff_find_by_namelen(const char *name, size_tstatic int parse_funcname (struct userdiff_funcname *f,const char *k,const char *v,int cflags) { -if (git_config_string (&f->pattern, k, v) <0 ) +if (git_config_string ((char **) &f->pattern, k, v) <0 )return -1 ; f->cflags = cflags;return 0 ;
@@ -445,15 +445,15 @@ int userdiff_config(const char *k, const char *v)if (!strcmp (type,"binary" ))return parse_tristate (&drv->binary, k, v);if (!strcmp (type,"command" )) -return git_config_string (&drv->external, k, v); +return git_config_string ((char **) &drv->external, k, v);if (!strcmp (type,"textconv" )) -return git_config_string (&drv->textconv, k, v); +return git_config_string ((char **) &drv->textconv, k, v);if (!strcmp (type,"cachetextconv" ))return parse_bool (&drv->textconv_want_cache, k, v);if (!strcmp (type,"wordregex" )) -return git_config_string (&drv->word_regex, k, v); +return git_config_string ((char **) &drv->word_regex, k, v);if (!strcmp (type,"algorithm" )) -return git_config_string (&drv->algorithm, k, v); +return git_config_string ((char **) &drv->algorithm, k, v);return 0 ; }
userdiff.h +6 -6
@@ -7,19 +7,19 @@ struct index_state;struct repository ;struct userdiff_funcname { -char *pattern; +const char *pattern;int cflags; };struct userdiff_driver {const char *name; -char *external; -char *algorithm; +const char *external; +const char *algorithm;int binary;struct userdiff_funcname funcname; -char *word_regex; -char *word_regex_multi_byte; -char *textconv; +const char *word_regex; +const char *word_regex_multi_byte; +const char *textconv;struct notes_cache *textconv_cache;int textconv_want_cache; };
Signature · 1 line
2.45.1.313.g3a57aa566a.dirty
PATCH v2 4/19 compat/win32: fix const-correctness with string constants
In reply to Patrick SteinhardtAdjust various places in our Win32 compatibility layer where we are not assigning string constants to const char * variables.
--- compat/basename.c | 15 +++++++++++++-- compat/mingw.c | 25 +++++++++++++------------ compat/winansi.c | 2 +- 3 files changed, 27 insertions(+), 15 deletions(-)
compat/basename.c +13 -2
@@ -1,6 +1,13 @@#include "../git-compat-util.h" #include "../strbuf.h" +/* +* Both basename(3P) and dirname(3P) are mis-specified because they return a +* non-constant pointer even though it is specified that they may return a +* pointer to internal memory. This variable here is a result of that. +*/ +static char current_directory[] ="." ; +/* Adapted from libiberty's basename.c. */ char *gitbasename (char *path) {
@@ -10,7 +17,7 @@ char *gitbasename (char *path)skip_dos_drive_prefix (&path);if (!path || !*path) -return "." ; +return current_directory;for (base = path; *path; path++) {if (!is_dir_sep (*path))
@@ -33,8 +40,12 @@ char *gitdirname(char *path)char *p = path, *slash =NULL , c;int dos_drive_prefix; +/* +* Same here, dirname(3P) is broken because it returns a non-constant +* pointer that may point to internal memory. +*/ if (!p) -return "." ; +return current_directory;if ((dos_drive_prefix =skip_dos_drive_prefix (&p)) && !*p) goto dot;
compat/mingw.c +13 -12
@@ -2257,6 +2257,7 @@ struct passwd *getpwuid(int uid) {static unsigned initialized;static char user_name[100 ]; +static char unknown[] ="unknown" ;static struct passwd *p;wchar_t buf[100 ];DWORD len;
@@ -2279,7 +2280,7 @@ struct passwd *getpwuid(int uid) p->pw_name = user_name; p->pw_gecos =get_extended_user_info (NameDisplay);if (!p->pw_gecos) - p->pw_gecos ="unknown" ; + p->pw_gecos = unknown; p->pw_dir =NULL ; initialized =1 ;
@@ -2800,16 +2801,16 @@ int is_path_owned_by_current_sid(const char *path, struct strbuf *report)strbuf_addf (report,"'%s' is on a file system that does " "not record ownership\n" , path); }else if (report) { -LPSTR str1, str2, str3, str4, to_free1 =NULL , - to_free3 =NULL , to_local_free2 =NULL , - to_local_free4 =NULL ; +PCSTR str1, str2, str3, str4; +LPSTR to_free1 =NULL , to_free3 =NULL , + to_local_free2 =NULL , to_local_free4 =NULL ; -if (user_sid_to_user_name (sid, &str1)) - to_free1 = str1; +if (user_sid_to_user_name (sid, &to_free1)) + str1 = to_free1;else str1 ="(inconvertible)" ; -if (ConvertSidToStringSidA (sid, &str2)) - to_local_free2 = str2; +if (ConvertSidToStringSidA (sid, &to_local_free2)) + str2 = to_local_free2;else str2 ="(inconvertible)" ;
@@ -2822,13 +2823,13 @@ int is_path_owned_by_current_sid(const char *path, struct strbuf *report) str4 ="(invalid)" ; }else {if (user_sid_to_user_name (current_user_sid, - &str3)) - to_free3 = str3; + &to_free3)) + str3 = to_free3;else str3 ="(inconvertible)" ;if (ConvertSidToStringSidA (current_user_sid, - &str4)) - to_local_free4 = str4; + &to_local_free4)) + str4 = to_local_free4;else str4 ="(inconvertible)" ; }
compat/winansi.c +1 -1
@@ -139,7 +139,7 @@ static void write_console(unsigned char *str, size_t len)/* convert utf-8 to utf-16 */ int wlen =xutftowcsn (wbuf, (char *) str,ARRAY_SIZE (wbuf), len);if (wlen <0 ) { -wchar_t *err =L"[invalid]" ; +const wchar_t *err =L"[invalid]" ;WriteConsoleW (console, err,wcslen (err), &dummy,NULL );return ; }
Signature · 1 line
2.45.1.313.g3a57aa566a.dirty
PATCH v2 5/19 refspec: remove global tag refspec structure
In reply to Patrick SteinhardtWe have a global tag refspec structure that is used by both git-clone(1) and git-fetch(1). Initialization fo the structure will break once we enable -Wwrite-strings, even though the breakage is harmless. While we could just add casts, the structure isn't really required in the first place as we can simply initialize the structures at the respective callsites.
Refactor the code accordingly.
--- builtin/clone.c | 8 ++++++-- builtin/fetch.c | 11 ++++++++--- refspec.c | 13 ------------- refspec.h | 1 - 4 files changed, 14 insertions(+), 19 deletions(-)
builtin/clone.c +6 -2
@@ -523,6 +523,9 @@ static struct ref *wanted_peer_refs(const struct ref *refs,struct ref *head =copy_ref (find_ref_by_name (refs,"HEAD" ));struct ref *local_refs = head;struct ref **tail = head ? &head->next : &local_refs; +struct refspec_item tag_refspec; + +refspec_item_init (&tag_refspec,TAG_REFSPEC ,0 );if (option_single_branch) {struct ref *remote_head =NULL ;
@@ -545,7 +548,7 @@ static struct ref *wanted_peer_refs(const struct ref *refs, &tail, 0);/* if --branch=tag, pull the requested tag explicitly */ -get_fetch_map (remote_head, tag_refspec, &tail,0 ); +get_fetch_map (remote_head, &tag_refspec, &tail,0 ); }free_refs (remote_head); }else {
@@ -555,8 +558,9 @@ static struct ref *wanted_peer_refs(const struct ref *refs, }if (!option_mirror && !option_single_branch && !option_no_tags) -get_fetch_map (refs, tag_refspec, &tail,0 ); +get_fetch_map (refs, &tag_refspec, &tail,0 ); +refspec_item_clear (&tag_refspec);return local_refs; }
builtin/fetch.c +8 -3
@@ -582,11 +582,16 @@ static struct ref *get_ref_map(struct remote *remote, } } -if (tags ==TAGS_SET ) +if (tags ==TAGS_SET ) { +struct refspec_item tag_refspec; +/* also fetch all tags */ -get_fetch_map (remote_refs, tag_refspec, &tail,0 ); -else if (tags ==TAGS_DEFAULT && *autotags) +refspec_item_init (&tag_refspec,TAG_REFSPEC ,0 ); +get_fetch_map (remote_refs, &tag_refspec, &tail,0 ); +refspec_item_clear (&tag_refspec); + }else if (tags ==TAGS_DEFAULT && *autotags) {find_non_local_tags (remote_refs,NULL , &ref_map, &tail); + }/* Now append any refs to be updated opportunistically: */ *tail = orefs;
refspec.c +0 -13
@@ -7,19 +7,6 @@#include "refspec.h" #include "strbuf.h" -static struct refspec_item s_tag_refspec = { - .force =0 , - .pattern =1 , - .matching =0 , - .exact_sha1 =0 , - .negative =0 , - .src ="refs/tags/*" , - .dst ="refs/tags/*" , -}; - -/* See TAG_REFSPEC for the string version */ -const struct refspec_item *tag_refspec = &s_tag_refspec; -/* * Parses the provided refspec 'refspec' and populates the refspec_item 'item'. * Returns 1 if successful and 0 if the refspec is invalid.
refspec.h +0 -1
@@ -2,7 +2,6 @@#define REFSPEC_H #define TAG_REFSPEC "refs/tags/*:refs/tags/*" -extern const struct refspec_item *tag_refspec; /** * A struct refspec_item holds the parsed interpretation of a refspec. If it
Signature · 1 line
2.45.1.313.g3a57aa566a.dirty
PATCH v2 6/19 http: do not assign string constant to non-const field
In reply to Patrick SteinhardtIn write_accept_language(), we put all acceptable languages into an array. While all entries in that array are allocated strings, the final entry in that array is a string constant. This is fine because we explicitly skip over the last entry when freeing the array, but will cause warnings once we enable -Wwrite-strings.
Adapt the code to also allocate the final entry.
--- http.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
http.c +2 -3
@@ -1974,7 +1974,7 @@ static void write_accept_language(struct strbuf *buf)/* add '*' */ REALLOC_ARRAY (language_tags, num_langs +1 ); - language_tags[num_langs++] ="*" ;/* it's OK; this won't be freed */ + language_tags[num_langs++] =xstrdup ("*" );/* compute decimal_places */ for (max_q = 1, decimal_places = 0;
@@ -2004,8 +2004,7 @@ static void write_accept_language(struct strbuf *buf) } } -/* free language tags -- last one is a static '*' */ -for (i =0 ; i < num_langs -1 ; i++) +for (i =0 ; i < num_langs; i++)free (language_tags[i]);free (language_tags); }
Signature · 1 line
2.45.1.313.g3a57aa566a.dirty
PATCH v2 7/19 line-log: always allocate the output prefix
In reply to Patrick SteinhardtThe returned string by output_prefix() is sometimes a string constant and sometimes an allocated string. This has been fine until now because we always leak the allocated strings, and thus we never tried to free the string constant.
Fix the code to always return an allocated string and free the returned value at all callsites.
--- line-log.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
line-log.c +11 -7
@@ -899,14 +899,12 @@ static void print_line(const char *prefix, char first,static char *output_prefix (struct diff_options *opt) { -char *prefix ="" ; -if (opt->output_prefix) {struct strbuf *sb = opt->output_prefix (opt, opt->output_prefix_data); - prefix = sb->buf; +return sb->buf; + }else { +return xstrdup ("" ); } - -return prefix; }static void dump_diff_hacky_one (struct rev_info *rev,struct line_log_data *range)
@@ -927,7 +925,7 @@ static void dump_diff_hacky_one(struct rev_info *rev, struct line_log_data *rangconst char *c_context =diff_get_color (opt->use_color,DIFF_CONTEXT );if (!pair || !diff) -return ; + goto out;if (pair->one->oid_valid)fill_line_ends (rev->diffopt.repo, pair->one, &p_lines, &p_ends);
@@ -1002,8 +1000,10 @@ static void dump_diff_hacky_one(struct rev_info *rev, struct line_log_data *rang c_context, c_reset, opt->file); } +out:free (p_ends);free (t_ends); +free (prefix); }/*
@@ -1012,7 +1012,11 @@ static void dump_diff_hacky_one(struct rev_info *rev, struct line_log_data *rang*/ static void dump_diff_hacky (struct rev_info *rev,struct line_log_data *range) { -fprintf (rev->diffopt.file,"%s\n" ,output_prefix (&rev->diffopt)); +char *prefix =output_prefix (&rev->diffopt); + +fprintf (rev->diffopt.file,"%s\n" , prefix); +free (prefix); +while (range) {dump_diff_hacky_one (rev, range); range = range->next;
Signature · 1 line
2.45.1.313.g3a57aa566a.dirty
PATCH v2 8/19 object-file: make `buf` parameter of `index_mem()` a constant
In reply to Patrick SteinhardtThe buf parameter of index_mem() is a non-constant string. This will break once we enable -Wwrite-strings because we also pass constants from at least one callsite.
Adapt the parameter to be a constant. As we cannot free the buffer without casting now, this also requires us to move the lifetime of the nested buffer around.
--- object-file.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
object-file.c +7 -7
@@ -2483,12 +2483,13 @@ static int hash_format_check_report(struct fsck_options *opts UNUSED, }static int index_mem (struct index_state *istate, -struct object_id *oid,void *buf,size_t size, +struct object_id *oid, +const void *buf,size_t size,enum object_type type,const char *path,unsigned flags) { +struct strbuf nbuf =STRBUF_INIT ;int ret =0 ; -int re_allocated =0 ;int write_object = flags &HASH_WRITE_OBJECT ;if (!type)
@@ -2498,11 +2499,10 @@ static int index_mem(struct index_state *istate,* Convert blobs to git internal format */ if ((type ==OBJ_BLOB ) && path) { -struct strbuf nbuf =STRBUF_INIT ;if (convert_to_git (istate, path, buf, size, &nbuf,get_conv_flags (flags))) { - buf =strbuf_detach (&nbuf, &size); - re_allocated =1 ; + buf = nbuf.buf; + size = nbuf.len; } }if (flags &HASH_FORMAT_CHECK ) {
@@ -2519,8 +2519,8 @@ static int index_mem(struct index_state *istate, ret =write_object_file (buf, size, type, oid); elsehash_object_file (the_hash_algo ,buf ,size ,type ,oid ); -if (re_allocated) -free (buf); + +strbuf_release (&nbuf);return ret; }
Signature · 1 line
2.45.1.313.g3a57aa566a.dirty
PATCH v2 9/19 parse-options: cast long name for OPTION_ALIAS
In reply to Patrick SteinhardtWe assign the long name for OPTION_ALIAS options to a non-constant value field. We know that the variable will never be written to, but this will cause warnings once we enable -Wwrite-strings.
Cast away the constness to be prepared for this change.
--- parse-options.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
parse-options.h +1 -1
@@ -355,7 +355,7 @@ struct option { .type = OPTION_ALIAS, \ .short_name = (s), \ .long_name = (l), \ - .value = (source_long_name), \ + .value = (char *)(source_long_name), \ }#define OPT_SUBCOMMAND_F (l, v, fn, f) { \
Signature · 1 line
2.45.1.313.g3a57aa566a.dirty
PATCH v2 10/19 send-pack: always allocate receive status
In reply to Patrick SteinhardtIn receive_status(), we record the reason why ref updates have been rejected by the remote via the remote_status. But while we allocate the assigned string when a reason was given, we assign a string constant when no reason was given.
This has been working fine so far due to two reasons:
- We don't ever free the refs in git-send-pack(1)'
- Remotes always give a reason, at least as implemented by Git proper.
Adapt the code to always allocate the receive status string and free the refs.
--- builtin/send-pack.c | 2 ++ send-pack.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)
builtin/send-pack.c +2 -0
@@ -336,5 +336,7 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)/* stable plumbing output; do not modify or localize */ fprintf (stderr,"Everything up-to-date\n" ); +free_refs (remote_refs); +free_refs (local_refs);return ret; }
send-pack.c +1 -1
@@ -259,7 +259,7 @@ static int receive_status(struct packet_reader *reader, struct ref *refs)if (p) hint->remote_status =xstrdup (p);else - hint->remote_status ="failed" ; + hint->remote_status =xstrdup ("failed" ); }else { hint->status =REF_STATUS_OK ; hint->remote_status =xstrdup_or_null (p);
Signature · 1 line
2.45.1.313.g3a57aa566a.dirty
PATCH v2 11/19 remote-curl: avoid assigning string constant to non-const variable
In reply to Patrick SteinhardtWhen processing remote options, we split the option line into two by searching for a space. If there is one, we replace the space with '\0', otherwise we implicitly assume that the value is "true" and thus assign a string constant.
As the return value of strchr(3P) weirdly enough is a char * even though it gets a const char * as input, the assigned-to variable also is a non-constant. This is fine though because the argument is in fact an allocated string, and thus we are allowed to modify it. But this will break once we enable -Wwrite-strings.
Refactor the code stop splitting the fields with '\0' altogether. Instead, we can pass the length of the option name to set_option() and then use strncmp(3P) instead of strcmp(3P).
--- remote-curl.c | 53 ++++++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 26 deletions(-)
remote-curl.c +27 -26
@@ -58,9 +58,9 @@ struct options {static struct options options;static struct string_list cas_options =STRING_LIST_INIT_DUP ; -static int set_option (const char *name,const char *value) +static int set_option (const char *name,size_t namelen,const char *value) { -if (!strcmp (name,"verbosity" )) { +if (!strncmp (name,"verbosity" , namelen)) {char *end;int v =strtol (value, &end,10 );if (value == end || *end)
@@ -68,7 +68,7 @@ static int set_option(const char *name, const char *value) options.verbosity = v;return 0 ; } -else if (!strcmp (name,"progress" )) { +else if (!strncmp (name,"progress" , namelen)) {if (!strcmp (value,"true" )) options.progress =1 ;else if (!strcmp (value,"false" ))
@@ -77,7 +77,7 @@ static int set_option(const char *name, const char *value)return -1 ;return 0 ; } -else if (!strcmp (name,"depth" )) { +else if (!strncmp (name,"depth" , namelen)) {char *end;unsigned long v =strtoul (value, &end,10 );if (value == end || *end)
@@ -85,15 +85,15 @@ static int set_option(const char *name, const char *value) options.depth = v;return 0 ; } -else if (!strcmp (name,"deepen-since" )) { +else if (!strncmp (name,"deepen-since" , namelen)) { options.deepen_since =xstrdup (value);return 0 ; } -else if (!strcmp (name,"deepen-not" )) { +else if (!strncmp (name,"deepen-not" , namelen)) {string_list_append (&options.deepen_not, value);return 0 ; } -else if (!strcmp (name,"deepen-relative" )) { +else if (!strncmp (name,"deepen-relative" , namelen)) {if (!strcmp (value,"true" )) options.deepen_relative =1 ;else if (!strcmp (value,"false" ))
@@ -102,7 +102,7 @@ static int set_option(const char *name, const char *value)return -1 ;return 0 ; } -else if (!strcmp (name,"followtags" )) { +else if (!strncmp (name,"followtags" , namelen)) {if (!strcmp (value,"true" )) options.followtags =1 ;else if (!strcmp (value,"false" ))
@@ -111,7 +111,7 @@ static int set_option(const char *name, const char *value)return -1 ;return 0 ; } -else if (!strcmp (name,"dry-run" )) { +else if (!strncmp (name,"dry-run" , namelen)) {if (!strcmp (value,"true" )) options.dry_run =1 ;else if (!strcmp (value,"false" ))
@@ -120,7 +120,7 @@ static int set_option(const char *name, const char *value)return -1 ;return 0 ; } -else if (!strcmp (name,"check-connectivity" )) { +else if (!strncmp (name,"check-connectivity" , namelen)) {if (!strcmp (value,"true" )) options.check_self_contained_and_connected =1 ;else if (!strcmp (value,"false" ))
@@ -129,7 +129,7 @@ static int set_option(const char *name, const char *value)return -1 ;return 0 ; } -else if (!strcmp (name,"cas" )) { +else if (!strncmp (name,"cas" , namelen)) {struct strbuf val =STRBUF_INIT ;strbuf_addstr (&val,"--force-with-lease=" );if (*value !='"' )
@@ -139,7 +139,7 @@ static int set_option(const char *name, const char *value)string_list_append (&cas_options, val.buf);strbuf_release (&val);return 0 ; - }else if (!strcmp (name,TRANS_OPT_FORCE_IF_INCLUDES )) { + }else if (!strncmp (name,TRANS_OPT_FORCE_IF_INCLUDES , namelen)) {if (!strcmp (value,"true" )) options.force_if_includes =1 ;else if (!strcmp (value,"false" ))
@@ -147,7 +147,7 @@ static int set_option(const char *name, const char *value)else return -1 ;return 0 ; - }else if (!strcmp (name,"cloning" )) { + }else if (!strncmp (name,"cloning" , namelen)) {if (!strcmp (value,"true" )) options.cloning =1 ;else if (!strcmp (value,"false" ))
@@ -155,7 +155,7 @@ static int set_option(const char *name, const char *value)else return -1 ;return 0 ; - }else if (!strcmp (name,"update-shallow" )) { + }else if (!strncmp (name,"update-shallow" , namelen)) {if (!strcmp (value,"true" )) options.update_shallow =1 ;else if (!strcmp (value,"false" ))
@@ -163,7 +163,7 @@ static int set_option(const char *name, const char *value)else return -1 ;return 0 ; - }else if (!strcmp (name,"pushcert" )) { + }else if (!strncmp (name,"pushcert" , namelen)) {if (!strcmp (value,"true" )) options.push_cert =SEND_PACK_PUSH_CERT_ALWAYS ;else if (!strcmp (value,"false" ))
@@ -173,7 +173,7 @@ static int set_option(const char *name, const char *value)else return -1 ;return 0 ; - }else if (!strcmp (name,"atomic" )) { + }else if (!strncmp (name,"atomic" , namelen)) {if (!strcmp (value,"true" )) options.atomic =1 ;else if (!strcmp (value,"false" ))
@@ -181,7 +181,7 @@ static int set_option(const char *name, const char *value)else return -1 ;return 0 ; - }else if (!strcmp (name,"push-option" )) { + }else if (!strncmp (name,"push-option" , namelen)) {if (*value !='"' )string_list_append (&options.push_options, value);else {
@@ -192,7 +192,7 @@ static int set_option(const char *name, const char *value) strbuf_detach(&unquoted, NULL)); }return 0 ; - }else if (!strcmp (name,"family" )) { + }else if (!strncmp (name,"family" , namelen)) {if (!strcmp (value,"ipv4" )) git_curl_ipresolve =CURL_IPRESOLVE_V4 ;else if (!strcmp (value,"ipv6" ))
@@ -202,16 +202,16 @@ static int set_option(const char *name, const char *value)else return -1 ;return 0 ; - }else if (!strcmp (name,"from-promisor" )) { + }else if (!strncmp (name,"from-promisor" , namelen)) { options.from_promisor =1 ;return 0 ; - }else if (!strcmp (name,"refetch" )) { + }else if (!strncmp (name,"refetch" , namelen)) { options.refetch =1 ;return 0 ; - }else if (!strcmp (name,"filter" )) { + }else if (!strncmp (name,"filter" , namelen)) { options.filter =xstrdup (value);return 0 ; - }else if (!strcmp (name,"object-format" )) { + }else if (!strncmp (name,"object-format" , namelen)) { options.object_format =1 ;if (strcmp (value,"true" ))die (_ ("unknown value for object-format: %s" ), value);
@@ -1588,15 +1588,16 @@ int cmd_main(int argc, const char **argv)parse_push (&buf); }else if (skip_prefix (buf.buf,"option " , &arg)) { -char *value =strchr (arg,' ' ); +const char *value =strchrnul (arg,' ' ); +size_t arglen = value - arg;int result; -if (value) - *value++ ='\0' ; +if (*value) + value++;/* skip over SP */ else value ="true" ; - result =set_option (arg, value); + result =set_option (arg, arglen, value);if (!result)printf ("ok\n" );else if (result <0 )
Signature · 1 line
2.45.1.313.g3a57aa566a.dirty
PATCH v2 12/19 revision: always store allocated strings in output encoding
In reply to Patrick SteinhardtThe git_log_output_encoding variable can be set via the --encoding= option. When doing so, we conditionally either assign it to the passed value, or if the value is "none" we assign it the empty string. Depending on which of the both code paths we pick though, the variable may end up being assigned either an allocated string or a string constant.
This is somewhat risky and may easily lead to bugs when a different code path may want to reassign a new value to it, freeing the previous value. We already to this when parsing the "i18n.logoutputencoding" config in git_default_i18n_config(). But because the config is typically parsed before we parse command line options this has been fine so far.
Regardless of that, safeguard the code such that the variable always contains an allocated string. While at it, also free the old value in case there was any to plug a potential memory leak.
--- revision.c | 3 ++- t/t3900-i18n-commit.sh | 1 + t/t3901-i18n-patch.sh | 1 + 3 files changed, 4 insertions(+), 1 deletion(-)
revision.c +2 -1
@@ -2650,10 +2650,11 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg }else if (!strcmp (arg,"--invert-grep" )) { revs->grep_filter.no_body_match =1 ; }else if ((argcount =parse_long_opt ("encoding" , argv, &optarg))) { +free (git_log_output_encoding);if (strcmp (optarg,"none" )) git_log_output_encoding =xstrdup (optarg);else - git_log_output_encoding ="" ; + git_log_output_encoding =xstrdup ("" );return argcount; }else if (!strcmp (arg,"--reverse" )) { revs->reverse ^=1 ;
t/t3900-i18n-commit.sh +1 -0
@@ -5,6 +5,7 @@ test_description='commit and log output encodings' +TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh compare_with () {
t/t3901-i18n-patch.sh +1 -0
@@ -8,6 +8,7 @@ test_description='i18n settings and format-patch | am pipe' GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME +TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh check_encoding () {
Signature · 1 line
2.45.1.313.g3a57aa566a.dirty
PATCH v2 13/19 mailmap: always store allocated strings in mailmap blob
In reply to Patrick SteinhardtSame as with the preceding commit, the git_mailmap_blob may sometimes contain an allocated string and sometimes it may contain a string constant. This is risky and can easily lead to bugs in case the variable is getting re-assigned, where the code may then try to free the previous value to avoid memory leaks.
Safeguard the code by always storing allocated strings in the variable.
--- mailmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mailmap.c +1 -1
@@ -216,7 +216,7 @@ int read_mailmap(struct string_list *map) map->cmp = namemap_cmp;if (!git_mailmap_blob &&is_bare_repository ()) - git_mailmap_blob ="HEAD:.mailmap" ; + git_mailmap_blob =xstrdup ("HEAD:.mailmap" );if (!startup_info->have_repository || !is_bare_repository ()) err |= read_mailmap_file(map, ".mailmap",
Signature · 1 line
2.45.1.313.g3a57aa566a.dirty
PATCH v2 14/19 imap-send: drop global `imap_server_conf` variable
In reply to Patrick SteinhardtIn "imap-send.c", we have a global sturct imap_server_conf variable that keeps track of the configuration of the IMAP server. This variable is being populated mostly via the Git configuration.
Refactor the code to allocate the structure on the stack instead of having it globally. This change allows us to track its lifetime more closely.
--- imap-send.c | 57 ++++++++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 27 deletions(-)
imap-send.c +30 -27
@@ -82,10 +82,6 @@ struct imap_server_conf {char *auth_method; }; -static struct imap_server_conf server = { - .ssl_verify =1 , -}; -struct imap_socket {int fd[2 ];SSL *ssl;
@@ -110,6 +106,7 @@ struct imap { };struct imap_store { +const struct imap_server_conf *cfg;/* currently open mailbox */ const char *name;/* foreign! maybe preset? */ int uidvalidity;
@@ -194,8 +191,8 @@ static void socket_perror(const char *func, struct imap_socket *sock, int ret)#ifdef NO_OPENSSL static int ssl_socket_connect(struct imap_socket *sock UNUSED, - int use_tls_only UNUSED, - int verify UNUSED) +const struct imap_server_conf *cfg, + int use_tls_only UNUSED) {fprintf (stderr,"SSL requested but SSL support not compiled in\n" );return -1 ;
@@ -250,7 +247,9 @@ static int verify_hostname(X509 *cert, const char *hostname) cname, hostname); } -static int ssl_socket_connect (struct imap_socket *sock,int use_tls_only,int verify) +static int ssl_socket_connect (struct imap_socket *sock, +const struct imap_server_conf *cfg, +int use_tls_only) {#if (OPENSSL_VERSION_NUMBER >=0x10000000L )const SSL_METHOD *meth;
@@ -279,7 +278,7 @@ static int ssl_socket_connect(struct imap_socket *sock, int use_tls_only, int veif (use_tls_only)SSL_CTX_set_options (ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3); -if (verify) +if (cfg->ssl_verify)SSL_CTX_set_verify (ctx,SSL_VERIFY_PEER ,NULL );if (!SSL_CTX_set_default_verify_paths (ctx)) {
@@ -306,9 +305,9 @@ static int ssl_socket_connect(struct imap_socket *sock, int use_tls_only, int ve* OpenSSL does not document this function, but the implementation * returns 1 on success, 0 on failure after calling SSLerr(). */ - ret =SSL_set_tlsext_host_name (sock->ssl, server.host); + ret =SSL_set_tlsext_host_name (sock->ssl, cfg->host);if (ret !=1 ) -warning ("SSL_set_tlsext_host_name(%s) failed." , server.host); +warning ("SSL_set_tlsext_host_name(%s) failed." , cfg->host);#endif ret =SSL_connect (sock->ssl);
@@ -317,12 +316,12 @@ static int ssl_socket_connect(struct imap_socket *sock, int use_tls_only, int vereturn -1 ; } -if (verify) { +if (cfg->ssl_verify) {/* make sure the hostname matches that of the certificate */ cert =SSL_get_peer_certificate (sock->ssl);if (!cert)return error ("unable to get peer certificate." ); -if (verify_hostname (cert, server.host) <0 ) +if (verify_hostname (cert, cfg->host) <0 )return -1 ; }
@@ -895,7 +894,7 @@ static int auth_cram_md5(struct imap_store *ctx, const char *prompt)int ret;char *response; - response =cram (prompt, server.user, server.pass); + response =cram (prompt, ctx->cfg->user, ctx->cfg->pass); ret =socket_write (&ctx->imap->buf.sock, response,strlen (response));if (ret !=strlen (response))
@@ -935,6 +934,7 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, const cCALLOC_ARRAY (ctx,1 ); + ctx->cfg = srvc; ctx->imap =CALLOC_ARRAY (imap,1 ); imap->buf.sock.fd[0 ] = imap->buf.sock.fd[1 ] =-1 ; imap->in_progress_append = &imap->in_progress;
@@ -1035,7 +1035,7 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, const c imap->buf.sock.fd[1 ] =dup (s);if (srvc->use_ssl && -ssl_socket_connect (&imap->buf.sock,0 , srvc->ssl_verify)) { +ssl_socket_connect (&imap->buf.sock, srvc,0 )) {close (s); goto bail; }
@@ -1068,8 +1068,7 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, const cif (!srvc->use_ssl &&CAP (STARTTLS )) {if (imap_exec (ctx,NULL ,"STARTTLS" ) !=RESP_OK ) goto bail; -if (ssl_socket_connect (&imap->buf.sock,1 , - srvc->ssl_verify)) +if (ssl_socket_connect (&imap->buf.sock, srvc,1 )) goto bail;/* capabilities may have changed, so get the new capabilities */ if (imap_exec (ctx,NULL ,"CAPABILITY" ) !=RESP_OK )
@@ -1299,23 +1298,24 @@ static int split_msg(struct strbuf *all_msgs, struct strbuf *msg, int *ofs)static int git_imap_config (const char *var,const char *val,const struct config_context *ctx,void *cb) { +struct imap_server_conf *cfg = cb;if (!strcmp ("imap.sslverify" , var)) - server.ssl_verify =git_config_bool (var, val); + cfg->ssl_verify =git_config_bool (var, val);else if (!strcmp ("imap.preformattedhtml" , var)) - server.use_html =git_config_bool (var, val); + cfg->use_html =git_config_bool (var, val);else if (!strcmp ("imap.folder" , var)) -return git_config_string (&server.folder, var, val); +return git_config_string (&cfg->folder, var, val);else if (!strcmp ("imap.user" , var)) -return git_config_string (&server.user, var, val); +return git_config_string (&cfg->user, var, val);else if (!strcmp ("imap.pass" , var)) -return git_config_string (&server.pass, var, val); +return git_config_string (&cfg->pass, var, val);else if (!strcmp ("imap.tunnel" , var)) -return git_config_string (&server.tunnel, var, val); +return git_config_string (&cfg->tunnel, var, val);else if (!strcmp ("imap.authmethod" , var)) -return git_config_string (&server.auth_method, var, val); +return git_config_string (&cfg->auth_method, var, val);else if (!strcmp ("imap.port" , var)) - server.port =git_config_int (var, val, ctx->kvi); + cfg->port =git_config_int (var, val, ctx->kvi);else if (!strcmp ("imap.host" , var)) {if (!val) {return config_error_nonbool (var);
@@ -1324,11 +1324,11 @@ static int git_imap_config(const char *var, const char *val, val +=5 ; else if (starts_with(val, "imaps:")) { val +=6 ; - server.use_ssl =1 ; + cfg->use_ssl =1 ; }if (starts_with (val,"//" )) val +=2 ; - server.host =xstrdup (val); + cfg->host =xstrdup (val); } }else return git_default_config (var, val, ctx, cb);
@@ -1497,12 +1497,15 @@ static int curl_append_msgs_to_imap(struct imap_server_conf *server,int cmd_main (int argc,const char **argv) { +struct imap_server_conf server = { + .ssl_verify =1 , + };struct strbuf all_msgs =STRBUF_INIT ;int total;int nongit_ok;setup_git_directory_gently (&nongit_ok); -git_config (git_imap_config,NULL ); +git_config (git_imap_config, &server); argc =parse_options (argc, (const char **)argv,"" , imap_send_options, imap_send_usage,0 );
Signature · 1 line
2.45.1.313.g3a57aa566a.dirty
PATCH v2 15/19 imap-send: fix leaking memory in `imap_server_conf`
In reply to Patrick SteinhardtWe never free any of the config strings that we populate into the struct imap_server_conf. Fix this by creating a common exit path where we can free resources.
While at it, drop the unused member imap_server_conf::name.
--- imap-send.c | 65 ++++++++++++++++++++++++++++++++++------------------- 1 file changed, 42 insertions(+), 23 deletions(-)
imap-send.c +42 -23
@@ -69,7 +69,6 @@ static void imap_warn(const char *, ...);static char *next_arg (char **);struct imap_server_conf { -const char *name;char *tunnel;char *host;int port;
@@ -1300,23 +1299,28 @@ static int git_imap_config(const char *var, const char *val, {struct imap_server_conf *cfg = cb; -if (!strcmp ("imap.sslverify" , var)) +if (!strcmp ("imap.sslverify" , var)) { cfg->ssl_verify =git_config_bool (var, val); -else if (!strcmp ("imap.preformattedhtml" , var)) + }else if (!strcmp ("imap.preformattedhtml" , var)) { cfg->use_html =git_config_bool (var, val); -else if (!strcmp ("imap.folder" , var)) + }else if (!strcmp ("imap.folder" , var)) { +FREE_AND_NULL (cfg->folder);return git_config_string (&cfg->folder, var, val); -else if (!strcmp ("imap.user" , var)) + }else if (!strcmp ("imap.user" , var)) { +FREE_AND_NULL (cfg->folder);return git_config_string (&cfg->user, var, val); -else if (!strcmp ("imap.pass" , var)) + }else if (!strcmp ("imap.pass" , var)) { +FREE_AND_NULL (cfg->folder);return git_config_string (&cfg->pass, var, val); -else if (!strcmp ("imap.tunnel" , var)) + }else if (!strcmp ("imap.tunnel" , var)) { +FREE_AND_NULL (cfg->folder);return git_config_string (&cfg->tunnel, var, val); -else if (!strcmp ("imap.authmethod" , var)) + }else if (!strcmp ("imap.authmethod" , var)) { +FREE_AND_NULL (cfg->folder);return git_config_string (&cfg->auth_method, var, val); -else if (!strcmp ("imap.port" , var)) + }else if (!strcmp ("imap.port" , var)) { cfg->port =git_config_int (var, val, ctx->kvi); -else if (!strcmp ("imap.host" , var)) { + }else if (!strcmp ("imap.host" , var)) {if (!val) {return config_error_nonbool (var); }else {
@@ -1330,8 +1334,9 @@ static int git_imap_config(const char *var, const char *val, val +=2 ; cfg->host =xstrdup (val); } - }else + }else {return git_default_config (var, val, ctx, cb); + }return 0 ; }
@@ -1503,6 +1508,7 @@ int cmd_main(int argc, const char **argv)struct strbuf all_msgs =STRBUF_INIT ;int total;int nongit_ok; +int ret;setup_git_directory_gently (&nongit_ok);git_config (git_imap_config, &server);
@@ -1529,42 +1535,55 @@ int cmd_main(int argc, const char **argv)if (!server.folder) {fprintf (stderr,"no imap store specified\n" ); -return 1 ; + ret =1 ; + goto out; }if (!server.host) {if (!server.tunnel) {fprintf (stderr,"no imap host specified\n" ); -return 1 ; + ret =1 ; + goto out; } - server.host ="tunnel" ; + server.host =xstrdup ("tunnel" ); }/* read the messages */ if (strbuf_read (&all_msgs,0 ,0 ) <0 ) {error_errno (_ ("could not read from stdin" )); -return 1 ; + ret =1 ; + goto out; }if (all_msgs.len ==0 ) {fprintf (stderr,"nothing to send\n" ); -return 1 ; + ret =1 ; + goto out; } total =count_messages (&all_msgs);if (!total) {fprintf (stderr,"no messages to send\n" ); -return 1 ; + ret =1 ; + goto out; }/* write it to the imap server */ if (server.tunnel) -return append_msgs_to_imap (&server, &all_msgs, total); - + ret =append_msgs_to_imap (&server, &all_msgs, total);#ifdef USE_CURL_FOR_IMAP_SEND -if (use_curl) -return curl_append_msgs_to_imap (&server, &all_msgs, total); + else if (use_curl) + ret =curl_append_msgs_to_imap (&server, &all_msgs, total);#endif - -return append_msgs_to_imap (&server, &all_msgs, total); + else + ret =append_msgs_to_imap (&server, &all_msgs, total); + +out: +free (server.tunnel); +free (server.host); +free (server.folder); +free (server.user); +free (server.pass); +free (server.auth_method); +return ret; }
Signature · 1 line
2.45.1.313.g3a57aa566a.dirty
PATCH v2 16/19 builtin/rebase: do not assign default backend to non-constant field
In reply to Patrick SteinhardtThe struct rebase_options::default_backend field is a non-constant string, but is being assigned a constant via REBASE_OPTIONS_INIT. Refactor the code to initialize and release options via two functions rebase_options_init() and rebase_options_release(). Like this, we can easily adapt the former funnction to use xstrdup() on the default value without hiding it away in a macro.
--- builtin/rebase.c | 67 ++++++++++++++++++++++++++++-------------------- 1 file changed, 39 insertions(+), 28 deletions(-)
builtin/rebase.c +39 -28
@@ -131,25 +131,40 @@ struct rebase_options {int config_update_refs; }; -#define REBASE_OPTIONS_INIT { \ - .type = REBASE_UNSPECIFIED, \ - .empty = EMPTY_UNSPECIFIED, \ - .keep_empty = 1, \ - .default_backend = "merge", \ - .flags = REBASE_NO_QUIET, \ - .git_am_opts = STRVEC_INIT, \ - .exec = STRING_LIST_INIT_NODUP, \ - .git_format_patch_opt = STRBUF_INIT, \ - .fork_point = -1, \ - .reapply_cherry_picks = -1, \ - .allow_empty_message = 1, \ - .autosquash = -1, \ - .rebase_merges = -1, \ - .config_rebase_merges = -1, \ - .update_refs = -1, \ - .config_update_refs = -1, \ - .strategy_opts = STRING_LIST_INIT_NODUP,\ - } +static void rebase_options_init (struct rebase_options *opts) +{ +memset (opts,0 ,sizeof (*opts)); + opts->type =REBASE_UNSPECIFIED ; + opts->empty =EMPTY_UNSPECIFIED ; + opts->default_backend =xstrdup ("merge" ); + opts->keep_empty =1 ; + opts->flags =REBASE_NO_QUIET ; +strvec_init (&opts->git_am_opts); +string_list_init_nodup (&opts->exec); +strbuf_init (&opts->git_format_patch_opt,0 ); + opts->fork_point =-1 ; + opts->reapply_cherry_picks =-1 ; + opts->allow_empty_message =1 ; + opts->autosquash =-1 ; + opts->rebase_merges =-1 ; + opts->config_rebase_merges =-1 ; + opts->update_refs =-1 ; + opts->config_update_refs =-1 ; +string_list_init_nodup (&opts->strategy_opts); +} + +static void rebase_options_release (struct rebase_options *opts) +{ +free (opts->default_backend); +free (opts->reflog_action); +free (opts->head_name); +strvec_clear (&opts->git_am_opts); +free (opts->gpg_sign_opt); +string_list_clear (&opts->exec,0 ); +free (opts->strategy); +string_list_clear (&opts->strategy_opts,0 ); +strbuf_release (&opts->git_format_patch_opt); +}static struct replay_opts get_replay_opts (const struct rebase_options *opts) {
@@ -796,6 +811,7 @@ static int rebase_config(const char *var, const char *value, }if (!strcmp (var,"rebase.backend" )) { +FREE_AND_NULL (opts->default_backend);return git_config_string (&opts->default_backend, var, value); }
@@ -1045,7 +1061,7 @@ static int check_exec_cmd(const char *cmd)int cmd_rebase (int argc,const char **argv,const char *prefix) { -struct rebase_options options =REBASE_OPTIONS_INIT ; +struct rebase_options options;const char *branch_name;int ret, flags, total_argc, in_progress =0 ;int keep_base =0 ;
@@ -1178,6 +1194,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) };int i; +rebase_options_init (&options); +if (argc ==2 && !strcmp (argv[1 ],"-h" ))usage_with_options (builtin_rebase_usage, builtin_rebase_options);
@@ -1833,14 +1851,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) cleanup:strbuf_release (&buf);strbuf_release (&revisions); -free (options.reflog_action); -free (options.head_name); -strvec_clear (&options.git_am_opts); -free (options.gpg_sign_opt); -string_list_clear (&options.exec,0 ); -free (options.strategy); -string_list_clear (&options.strategy_opts,0 ); -strbuf_release (&options.git_format_patch_opt); +rebase_options_release (&options);free (squash_onto_name);free (keep_base_onto_name);return !!ret;
Signature · 1 line
2.45.1.313.g3a57aa566a.dirty
PATCH v2 17/19 builtin/rebase: always store allocated string in `options.strategy`
In reply to Patrick SteinhardtThe struct rebase_options::strategy field is a char *, but we do end up assigning string constants to it in two cases:
- When being passed a --strategy= option via the command line.
- When being passed a strategy option via --strategy-option=, but not a strategy.
This will cause warnings once we enable -Wwrite-strings.
Ideally, we'd just convert the field to be a const char *. But we also assign to this field via the GIT_TEST_MERGE_ALGORITHM envvar, which we have to strdup(3P) into it.
Instead, refactor the code to make sure that we only ever assign allocated strings to this field.
--- builtin/rebase.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
builtin/rebase.c +7 -7
@@ -1063,6 +1063,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) {struct rebase_options options;const char *branch_name; +const char *strategy_opt =NULL ;int ret, flags, total_argc, in_progress =0 ;int keep_base =0 ;int ok_to_skip_pre_rebase =0 ;
@@ -1177,7 +1178,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) PARSE_OPT_OPTARG, parse_opt_rebase_merges),OPT_BOOL (0 ,"fork-point" , &options.fork_point,N_ ("use 'merge-base --fork-point' to refine upstream" )), -OPT_STRING ('s' ,"strategy" , &options.strategy, +OPT_STRING ('s' ,"strategy" , &strategy_opt,N_ ("strategy" ),N_ ("use the given merge strategy" )), OPT_STRING_LIST('X', "strategy-option", &options.strategy_opts, N_("option"),
@@ -1488,13 +1489,12 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) } } -if (options.strategy_opts.nr && !options.strategy) - options.strategy ="ort" ; - -if (options.strategy) { - options.strategy =xstrdup (options.strategy); +if (strategy_opt) + options.strategy =xstrdup (strategy_opt); +else if (options.strategy_opts.nr && !options.strategy) + options.strategy =xstrdup ("ort" ); +if (options.strategy)imply_merge (&options,"--strategy" ); - }if (options.root && !options.onto_name)imply_merge (&options,"--root without --onto" );
Signature · 1 line
2.45.1.313.g3a57aa566a.dirty
PATCH v2 18/19 builtin/merge: always store allocated strings in `pull_twohead`
In reply to Patrick SteinhardtThe pull_twohead configuration may sometimes contain an allocated string, and sometimes it may contain a string constant. Refactor this to instead always store an allocated string such that we can release its resources without risk.
While at it, manage the lifetime of other config strings, as well. Note that we explicitly don't free cleanup_arg here. This is because the variable may be assigned a string constant via command line options.
--- builtin/merge.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
builtin/merge.c +11 -7
@@ -611,17 +611,19 @@ static int git_merge_config(const char *k, const char *v,return 0 ; } -if (!strcmp (k,"merge.diffstat" ) || !strcmp (k,"merge.stat" )) +if (!strcmp (k,"merge.diffstat" ) || !strcmp (k,"merge.stat" )) { show_diffstat =git_config_bool (k, v); -else if (!strcmp (k,"merge.verifysignatures" )) + }else if (!strcmp (k,"merge.verifysignatures" )) { verify_signatures =git_config_bool (k, v); -else if (!strcmp (k,"pull.twohead" )) + }else if (!strcmp (k,"pull.twohead" )) { +FREE_AND_NULL (pull_twohead);return git_config_string (&pull_twohead, k, v); -else if (!strcmp (k,"pull.octopus" )) + }else if (!strcmp (k,"pull.octopus" )) { +FREE_AND_NULL (pull_octopus);return git_config_string (&pull_octopus, k, v); -else if (!strcmp (k,"commit.cleanup" )) + }else if (!strcmp (k,"commit.cleanup" )) {return git_config_string (&cleanup_arg, k, v); -else if (!strcmp (k,"merge.ff" )) { + }else if (!strcmp (k,"merge.ff" )) {int boolval =git_parse_maybe_bool (v);if (0 <= boolval) { fast_forward = boolval ?FF_ALLOW :FF_NO ;
@@ -1294,7 +1296,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)if (!pull_twohead) {char *default_strategy =getenv ("GIT_TEST_MERGE_ALGORITHM" );if (default_strategy && !strcmp (default_strategy,"ort" )) - pull_twohead ="ort" ; + pull_twohead =xstrdup ("ort" ); }init_diff_ui_defaults ();
@@ -1793,6 +1795,8 @@ int cmd_merge(int argc, const char **argv, const char *prefix) }strbuf_release (&buf);free (branch_to_free); +free (pull_twohead); +free (pull_octopus);discard_index (the_repository->index);return ret; }
Signature · 1 line
2.45.1.313.g3a57aa566a.dirty
PATCH v2 19/19 config.mak.dev: enable `-Wwrite-strings` warning
In reply to Patrick SteinhardtWriting to string constants is undefined behaviour and must be avoided in C. Even so, the compiler does not help us with this by default because those constants are not in fact marked as const. This makes it rather easy to accidentally assign a constant to a non-const variable or field and then later on try to either free it or write to it.
Enable -Wwrite-strings to catch such mistakes. With this warning enabled, the type of string constants is changed to const char[] and will thus cause compiler warnings when being assigned to non-const fields and variables.
--- config.mak.dev | 1 + 1 file changed, 1 insertion(+)
config.mak.dev +1 -0
@@ -37,6 +37,7 @@ DEVELOPER_CFLAGS += -Wpointer-arith DEVELOPER_CFLAGS += -Wstrict-prototypes DEVELOPER_CFLAGS += -Wunused DEVELOPER_CFLAGS += -Wvla +DEVELOPER_CFLAGS += -Wwrite-strings DEVELOPER_CFLAGS += -fno-common ifneq ($(filter clang4,$(COMPILER_FEATURES)),)
Signature · 1 line
2.45.1.313.g3a57aa566a.dirty
Re: [PATCH 03/19] global: convert intentionally-leaking config strings to consts
In reply to Patrick SteinhardtQuoted 23 lines · Patrick Steinhardt
Quoted 22 lines · Junio C Hamano
Quoted 19 lines · Patrick Steinhardt
There are multiple cases where we intentionally leak config strings:
-
struct gpg_formatis used to track programs that can be used for signing commits, either via gpg(1), gpgsm(1) or ssh-keygen(1). The user can override the commands via several config variables. As the array is populated once, only, and will never be free'd, it is fine to treat the program as a quasi-constant.-
struct ll_merge_driveris used to track merge drivers. Same as with the GPG format, these drivers are populated once and then reused. Its data is never free'd, either.-
struct userdiff_funcnameandstruct userdiff_drivercan be configured viadiff.<driver>.*to add additional drivers. Again, these have a global lifetime and are never free'd.All of these are intentionally kept alive and never free'd. Let's mark the respective fields as
const char *and cast away the constness when assigning those values.
Quoted 7 lines
Quoted 2 lines
It is not unclear where the linkage between "not freed" and "must be const" comes from. What am I missing?
It comes from
-Wwrite-strings, which will mark string constants asconst char *. This will cause warnings in all of the above cases because the fields are being assigned constants, but those fields are currentlychar *. Will clarify.
In short, these warnings have nothing to do with the pointee by these variables or struct members are eventually freed or not, no?
Re: [PATCH 05/19] reftable: improve const correctness when assigning string constants
In reply to Patrick SteinhardtQuoted 25 lines · Patrick Steinhardt
Quoted 8 lines · Junio C Hamano
Quoted 6 lines · Patrick Steinhardt
reftable/basics_test.c +0
-0@@ -58,8 +58,8 @@ static void test_binsearch(void)Quoted 15 lines
reftable/basics_test.c static void test_binsearch(void) · line 63
Quoted 7 lines
reftable/basics_test.c +2
-2static void test_names_length (void ) { -char *a[] = {"a" ,"b" ,NULL }; -EXPECT (names_length (a) ==2 ); +char *names[] = { (char *)"a" , (char *)"b" ,NULL }; +EXPECT (names_length (names) ==2 ); }I would have preferred to see this kind of rewrite more than separate and clearly writable variables that are initialied with the constant contents e.g. branches[] = "refs/heads/*", we saw in earlier steps. Wouldn't that approach, combined with making the literal constants stored in read-only segment to trigger runtime failure when a bug causes the "unfortunately non-const" variables to be written, give us a better result?
Quoted 5 lines
Depends on what we mean by "better", I guess. But yeah, I was torn myself when writing this commit because there are so many string constants in the reftable tests that we assign to non-constant fields. I didn't find the result particularly easy to read when putting each of the constants into a separate variable.
Oh, I do *not* want to see.
char a_string[] = "a";
char *names[] = { a_string, ... };As a way to workaround the -Wwritable-strings warnings, what we see in this patch is much better.
I was referring to a redoing of this series in the other direction. The earlier one that introduced
char refspec_string[] = "refs/heads/*";
and rewrite assignments of
non_const_pointer_to_char = "refs/heads/*";
with
non_const_pointer_to_char = refspec_string;
would have been better if it were done without refspec_string[] array. It is a runtime bug to overwrite the refspec_string[] via the non_const_pointer_to_char, but use of refspec_string[] would make it impossible for us to catch.
Re: [PATCH 16/19] imap-send: fix leaking memory in `imap_server_conf`
In reply to Patrick SteinhardtQuoted 8 lines · Patrick Steinhardt
Oh, I wasn't aware that the parameter being
NULLactually causes a change in behaviour. Which nicely demonstrates that we have some missing test coverage for git-imap-send(1).In fact, it's not only "some". We don't have any test coverage at all for git-imap-send(1) as far as I can see. Which does make me rest a bit uneasy. And I suspect that it wouldn't be trivial to add given that it kind of requires something that talks IMAP on the receiving end.
Quite honestly, there is absolutely nothing that makes imap-send necessary to be part of Git suite. It does depend on Git as it uses our configuration files to store its knobs, but if it were written outside the context of the Git project as a handy way to move a draft message to your imap draft folder, it would have been perfectly fine as a standalone tool (and it would have used its own simple configuration file format).
Other than its use of .gitconfig, it does not even know what a commit is, unlike, say send-email [*], which is also fairly unrelated to Git proper.
Side note: send-email is only marginally closer to Git than imap-send, as it optionally can run format-patch as a part of its operation. Without the format-patch integration, it is just a MUA whose primary purpose is not to munge its payload.
So I do not find it surprising at all that we have no tests for it. We could do something like this at least, perhaps on top of the recent topic that added a test to ensure commands that ought to be operable without any repository?
t/t1517-outside-repo.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
t/t1517-outside-repo.sh +15 -0
@@ -56,4 +56,19 @@ test_expect_success 'grep outside repository' ' test_cmp expect actual ' +test_expect_success 'imap-send outside repository' ' + test_config_global imap.host imaps://localhost && + test_config_global imap.folder Drafts && + + echo nothing to send >expect && + test_must_fail git imap-send -v </dev/null 2>actual && + test_cmp expect actual && + + ( + cd non-repo && + test_must_fail git imap-send -v </dev/null 2>../actual + ) && + test_cmp expect actual +' + test_done
Re: [PATCH 02/19] global: assign non-const strings as required
In reply to Patrick SteinhardtQuoted 5 lines · Patrick Steinhardt
Well, we do. Not in
get_fetch_map(), but inquery_refspecs(). It does weird stuff where it writes the result into eithersrcordstdepending on which of these fields is provided by the caller. Which means that one of the fields would typically be a constant, whereas the other one will be allocated.
Yes, <src, dst> is used as a pair of <key, value> to query one with the other (i.e. "where does this one go?" "where does this one come from?").
But we are not talking about const-ness of the member (iow, once you point a string with the member, you cannot repoint the pointer to another string), but we are talking about const-ness of the string that is pointed by the member (iow, not "char const *src" but "const char *src"), no? If I ask "I have this src, where does it go?" with a refspec element filled with src, the dst member may need to be updated to point at the string that is the answer of the query, but that still can be done with "const char *src, *dst", can't it? That was what I was wondering.
And again you are conflating "allocated" with "read-write" here. It is often convenient if a variable that points at an allocated string is of type "char *" and not "const char *", because you do not cast it when calling free(). But if you want to make a structure member or a variable that holds an allocated string responsible for _owning_ the piece of memory, then you need to consistently have the member point at an allocated piece of memory (or NULL), no? What this patch does, i.e. prepare an on-stack refspec_str[] array that is initialized from a constant string, and have .src member point at it, would not make .src freeable. In other words, .src pointing at an allocated piece of string "some of the time" alone is not a good justification to make it a non-const pointer, I would think.
Quoted 5 lines · Patrick Steinhardt
@@
reftable/readwrite_test.c: static voidtest_write_key_order(void)
+ struct strbuf buf =STRBUF_INIT;
+ structreftable_writer*w =
reftable_new_writer(&strbuf_add_void, &noop_flush, &buf, &opts);
++ char a[] = "a", b[] = "b", target[] = "target";
So you decided to go in the complete opposite direction, hmph...
I was hoping that we do not add more "writable" pieces of memory like target[] only to please the constness-strict compilers.
Quoted 8 lines · Junio C Hamano
Quoted 5 lines · Patrick Steinhardt
@@
reftable/readwrite_test.c: static voidtest_write_key_order(void)
+ struct strbuf buf =STRBUF_INIT;
+ structreftable_writer*w =
reftable_new_writer(&strbuf_add_void, &noop_flush, &buf, &opts);
++ char a[] = "a", b[] = "b", target[] = "target";
Quoted 4 lines
So you decided to go in the complete opposite direction, hmph...
I was hoping that we do not add more "writable" pieces of memory like target[] only to please the constness-strict compilers.
I guess I misunderstood what you were saying. I'll revise this to go into the other direction.
Patrick
Re: [PATCH 02/19] global: assign non-const strings as required
In reply to Junio C HamanoQuoted 12 lines · Junio C Hamano
Quoted 5 lines · Patrick Steinhardt
Well, we do. Not in
get_fetch_map(), but inquery_refspecs(). It does weird stuff where it writes the result into eithersrcordstdepending on which of these fields is provided by the caller. Which means that one of the fields would typically be a constant, whereas the other one will be allocated.Yes, <src, dst> is used as a pair of <key, value> to query one with the other (i.e. "where does this one go?" "where does this one come from?").
Quoted 9 lines
But we are not talking about const-ness of the member (iow, once you point a string with the member, you cannot repoint the pointer to another string), but we are talking about const-ness of the string that is pointed by the member (iow, not "char const *src" but "const char *src"), no? If I ask "I have this src, where does it go?" with a refspec element filled with src, the dst member may need to be updated to point at the string that is the answer of the query, but that still can be done with "const char *src, *dst", can't it? That was what I was wondering.
Well, yes, the pointers can be updated. But that doesn't solve the underlying problem that the interface is not well-prepared to track ownership of its inputs and outputs.
The root problem is that struct refspec_item is being abused for multiple purposes. One of these purposes it to store parsed refspec items. Another purpose is to actually serve as a query. The requirements for those two purposes regarding the lifetime of associated strings is different:
- When using it for storage purposes the strings should be owned by the structure itself. Consequently, the lifetime should be managed by the structure too, namely via refspec_item_clear().
- When using it for parsing purposes the input string is owned by the caller, whereas the output string is owned by the callee and then handed over to the caller. Here we cannot rely on the structure itself to manage the lifetimes of both strings, at least not in the current form.
Now of course, we could amend struct refspec_item to grow two additional fields src_to_free and dst_to_free. But that only doubles down on this misdesigned interface.
The proper solution in my opinion is to detangle those two usecases and split them out into two independent interfaces.
Quoted 4 lines
And again you are conflating "allocated" with "read-write" here. It is often convenient if a variable that points at an allocated string is of type "char *" and not "const char *", because you do not cast it when calling
free(). But if you want to make a structure member
Quoted 8 lines
or a variable that holds an allocated string responsible for _owning_ the piece of memory, then you need to consistently have the member point at an allocated piece of memory (or NULL), no? What this patch does, i.e. prepare an on-stack refspec_str[] array that is initialized from a constant string, and have .src member point at it, would not make .src freeable. In other words, .src pointing at an allocated piece of string "some of the time" alone is not a good justification to make it a non-const pointer, I would think.
That's fair enough. I'm trying to work around a broken interface, but do not solve the underlying issue.
Patrick
Re: [PATCH 02/19] global: assign non-const strings as required
Quoted 63 lines · Patrick Steinhardt
Quoted 12 lines · Junio C Hamano
Quoted 5 lines · Patrick Steinhardt
Well, we do. Not in
get_fetch_map(), but inquery_refspecs(). It does weird stuff where it writes the result into eithersrcordstdepending on which of these fields is provided by the caller. Which means that one of the fields would typically be a constant, whereas the other one will be allocated.Yes, <src, dst> is used as a pair of <key, value> to query one with the other (i.e. "where does this one go?" "where does this one come from?").
Quoted 9 lines
But we are not talking about const-ness of the member (iow, once you point a string with the member, you cannot repoint the pointer to another string), but we are talking about const-ness of the string that is pointed by the member (iow, not "char const *src" but "const char *src"), no? If I ask "I have this src, where does it go?" with a refspec element filled with src, the dst member may need to be updated to point at the string that is the answer of the query, but that still can be done with "const char *src, *dst", can't it? That was what I was wondering.
Well, yes, the pointers can be updated. But that doesn't solve the underlying problem that the interface is not well-prepared to track ownership of its inputs and outputs.
The root problem is that
struct refspec_itemis being abused for multiple purposes. One of these purposes it to store parsed refspec items. Another purpose is to actually serve as a query. The requirements for those two purposes regarding the lifetime of associated strings is different:- When using it for storage purposes the strings should be owned by the structure itself. Consequently, the lifetime should be managed by the structure too, namely via
refspec_item_clear().- When using it for parsing purposes the input string is owned by the caller, whereas the output string is owned by the callee and then handed over to the caller. Here we cannot rely on the structure itself to manage the lifetimes of both strings, at least not in the current form.
Now of course, we could amend
struct refspec_itemto grow two additional fieldssrc_to_freeanddst_to_free. But that only doubles down on this misdesigned interface.The proper solution in my opinion is to detangle those two usecases and split them out into two independent interfaces.
Quoted 4 lines
And again you are conflating "allocated" with "read-write" here. It is often convenient if a variable that points at an allocated string is of type "char *" and not "const char *", because you do not cast it when calling
free(). But if you want to make a structure memberQuoted 8 lines
or a variable that holds an allocated string responsible for _owning_ the piece of memory, then you need to consistently have the member point at an allocated piece of memory (or NULL), no? What this patch does, i.e. prepare an on-stack refspec_str[] array that is initialized from a constant string, and have .src member point at it, would not make .src freeable. In other words, .src pointing at an allocated piece of string "some of the time" alone is not a good justification to make it a non-const pointer, I would think.
Quoted 4 lines
That's fair enough. I'm trying to work around a broken interface, but do not solve the underlying issue.
Patrick
In any case, I have now invested some more time into the individual sites where I was converting to use on-stack strings. In many of the cases we were indeed able to avoid the issue altogether without too much of a hassle. The end result is more pleasing indeed, I'd say.
Patrick
Re: [PATCH 02/19] global: assign non-const strings as required
In reply to Patrick SteinhardtQuoted 8 lines · Patrick Steinhardt
Quoted 7 lines · Junio C Hamano
Quoted 5 lines · Patrick Steinhardt
Well, we do. Not in
get_fetch_map(), but inquery_refspecs(). It does weird stuff where it writes the result into eithersrcordstdepending on which of these fields is provided by the caller. Which means that one of the fields would typically be a constant, whereas the other one will be allocated.
Quoted 4 lines
...
Well, yes, the pointers can be updated. But that doesn't solve the underlying problem that the interface is not well-prepared to track ownership of its inputs and outputs.
Oh, absolutely. That is exactly why I wondered why .src and .dst need to be "char *" and not "const char *". If the piece of memory these members point at are never modified via these pointers, marking them as "const char *" would help the compilers help us by catching when we try to break the promise.
Sometimes, the "constness of a pointer should help compilers help us avoid modifying a piece of memory we promised not to modify through the pointer" contradicts with the idea of (ab)using the constness to signal ownership, i.e., "const pointers point at something owned by somebody else, but via non-const pointers you always own the memory".
I wonder if we can do something to separate these two concerns apart, using a trick similar to what we often use with an extra variable "to_free". Doing so would bloat the refspec_item, but unlike the references themselves, there won't be thousands of them, so it may not be an issue, perhaps?
Quoted 15 lines
Quoted 4 lines
And again you are conflating "allocated" with "read-write" here. It is often convenient if a variable that points at an allocated string is of type "char *" and not "const char *", because you do not cast it when calling
free(). But if you want to make a structure memberQuoted 8 lines
or a variable that holds an allocated string responsible for _owning_ the piece of memory, then you need to consistently have the member point at an allocated piece of memory (or NULL), no? What this patch does, i.e. prepare an on-stack refspec_str[] array that is initialized from a constant string, and have .src member point at it, would not make .src freeable. In other words, .src pointing at an allocated piece of string "some of the time" alone is not a good justification to make it a non-const pointer, I would think.
That's fair enough. I'm trying to work around a broken interface, but do not solve the underlying issue.
Re: [PATCH 02/19] global: assign non-const strings as required
In reply to Patrick SteinhardtQuoted 4 lines · Patrick Steinhardt
In any case, I have now invested some more time into the individual sites where I was converting to use on-stack strings. In many of the cases we were indeed able to avoid the issue altogether without too much of a hassle. The end result is more pleasing indeed, I'd say.
Nice to hear that.
Thanks.
v3 cover Compile with `-Wwrite-strings`
In reply to Patrick SteinhardtHi,
this is the third version of my patch series that prepares the Git codebase to compile with -Wwrite-strings. This compiler warning changes the type of string constants from char [] to const char [], which helps to identify cases where we may accidentally write to or free such constants.
Changes compared to v2:
- I have split up the second patch into multiple patches. This was done so that we can have a deeper look at the respective sites that need adjustment.
- I dropped the local string arrays that I used in v2 and instead now use string constants with casts in some places where we expect that those should never be written to. This has the benefit that we would segfault in case that expectation is violated, instead of silently allowing a write to those local arrays.
- I adapted multiple commit messages to not only mention freeing of string constants, but also that writing to string constants is illegal.
Due to the split-up patch the range-diff got quite messy and was barely readable anymore. I thus included an interdiff instead, which should be way easier to read.
I realize that this patch series has grown quite large. Please let me know in case I shall split it up into multiple patch series.
Patrick
Patrick Steinhardt (27):
global: improve const correctness when assigning string constants
global: convert intentionally-leaking config strings to consts refs/reftable: stop micro-optimizing refname allocations on copy
reftable: cast away constness when assigning constants to records
refspec: remove global tag refspec structure builtin/remote: cast away constness in get_head_names()
diff: cast string constant in fill_textconv()
line-log: stop assigning string constant to file parent buffer
line-log: always allocate the output prefix
entry: refactor how we remove items for delayed checkouts
ident: add casts for fallback name and GECOS
object-file: mark cached object buffers as const
object-file: make buf parameter of index_mem() a constant
pretty: add casts for decoration option pointers compat/win32: fix const-correctness with string constants
http: do not assign string constant to non-const field
parse-options: cast long name for OPTION_ALIAS
send-pack: always allocate receive status
remote-curl: avoid assigning string constant to non-const variable
revision: always store allocated strings in output encoding
mailmap: always store allocated strings in mailmap blob
imap-send: drop global imap_server_conf variable
imap-send: fix leaking memory in imap_server_conf builtin/rebase: do not assign default backend to non-constant field builtin/rebase: always store allocated string in options.strategy builtin/merge: always store allocated strings in pull_twohead config.mak.dev: enable -Wwrite-strings warning
builtin/bisect.c | 3 +- builtin/blame.c | 2 +- builtin/bugreport.c | 2 +- builtin/check-ignore.c | 4 +- builtin/clone.c | 14 ++-- builtin/commit.c | 6 +- builtin/diagnose.c | 2 +- builtin/fetch.c | 11 ++- builtin/log.c | 2 +- builtin/mailsplit.c | 4 +- builtin/merge.c | 18 +++-- builtin/pull.c | 52 +++++++------- builtin/rebase.c | 81 ++++++++++++---------- builtin/receive-pack.c | 4 +- builtin/remote.c | 12 ++-- builtin/revert.c | 2 +- builtin/send-pack.c | 2 + compat/basename.c | 18 ++++- compat/mingw.c | 28 ++++---- compat/regex/regcomp.c | 2 +- compat/winansi.c | 2 +- config.mak.dev | 1 + diff.c | 6 +- diffcore-rename.c | 6 +- entry.c | 14 ++-- fmt-merge-msg.c | 2 +- fsck.c | 2 +- fsck.h | 2 +- gpg-interface.c | 6 +- http-backend.c | 2 +- http.c | 5 +- ident.c | 4 +- imap-send.c | 130 ++++++++++++++++++++--------------- line-log.c | 22 +++--- mailmap.c | 2 +- merge-ll.c | 11 ++- object-file.c | 23 ++++--- parse-options.h | 2 +- pretty.c | 6 +- refs.c | 2 +- refs.h | 2 +- refs/reftable-backend.c | 28 ++++---- refspec.c | 13 ---- refspec.h | 1 - reftable/basics.c | 15 ++-- reftable/basics.h | 4 +- reftable/basics_test.c | 4 +- reftable/block_test.c | 2 +- reftable/merged_test.c | 44 ++++++------ reftable/readwrite_test.c | 32 ++++----- reftable/record.c | 6 +- reftable/stack.c | 10 +-- reftable/stack_test.c | 56 +++++++-------- remote-curl.c | 53 +++++++------- revision.c | 3 +- run-command.c | 2 +- send-pack.c | 2 +- t/helper/test-hashmap.c | 3 +- t/helper/test-json-writer.c | 10 +-- t/helper/test-regex.c | 4 +- t/helper/test-rot13-filter.c | 5 +- t/t3900-i18n-commit.sh | 1 + t/t3901-i18n-patch.sh | 1 + t/unit-tests/t-strbuf.c | 10 +-- trailer.c | 2 +- userdiff.c | 10 +-- userdiff.h | 12 ++-- wt-status.c | 2 +- 68 files changed, 470 insertions(+), 386 deletions(-)
Interdiff against v2:
builtin/remote.c +6 -7
@@ -493,13 +493,13 @@ static int get_head_names(const struct ref *remote_refs, struct ref_states *stat {struct ref *ref, *matches;struct ref *fetch_map =NULL , **fetch_map_tail = &fetch_map; -struct refspec_item refspec; -char refspec_str[] ="refs/heads/*" ; +struct refspec_item refspec = { + .force =0 , + .pattern =1 , + .src = (char *)"refs/heads/*" , + .dst = (char *)"refs/heads/*" , + }; -memset (&refspec,0 ,sizeof (refspec)); - refspec.force =0 ; - refspec.pattern =1 ; - refspec.src = refspec.dst = refspec_str;get_fetch_map (remote_refs, &refspec, &fetch_map_tail,0 ); matches =guess_remote_head (find_ref_by_name (remote_refs,"HEAD" ), fetch_map,1 );
@@ -508,7 +508,6 @@ static int get_head_names(const struct ref *remote_refs, struct ref_states *statfree_refs (fetch_map);free_refs (matches); -return 0 ; }
compat/basename.c +14 -11
@@ -1,11 +1,6 @@#include "../git-compat-util.h" #include "../strbuf.h" -/* -* Both basename(3P) and dirname(3P) are mis-specified because they return a -* non-constant pointer even though it is specified that they may return a -* pointer to internal memory. This variable here is a result of that. -*/ static char current_directory[] ="." ;/* Adapted from libiberty's basename.c. */
@@ -17,7 +12,13 @@ char *gitbasename (char *path)skip_dos_drive_prefix (&path);if (!path || !*path) -return current_directory; +/* +* basename(3P) is mis-specified because it returns a +* non-constant pointer even though it is specified to return a +* pointer to internal memory at times. The cast is a result of +* that. +*/ +return (char *)"" ;for (base = path; *path; path++) {if (!is_dir_sep (*path))
@@ -40,12 +41,14 @@ char *gitdirname(char *path)char *p = path, *slash =NULL , c;int dos_drive_prefix; -/* -* Same here, dirname(3P) is broken because it returns a non-constant -* pointer that may point to internal memory. -*/ if (!p) -return current_directory; +/* +* dirname(3P) is mis-specified because it returns a +* non-constant pointer even though it is specified to return a +* pointer to internal memory at times. The cast is a result of +* that. +*/ +return (char *)"" ;if ((dos_drive_prefix =skip_dos_drive_prefix (&p)) && !*p) goto dot;
compat/mingw.c +5 -2
@@ -2257,7 +2257,6 @@ struct passwd *getpwuid(int uid) {static unsigned initialized;static char user_name[100 ]; -static char unknown[] ="unknown" ;static struct passwd *p;wchar_t buf[100 ];DWORD len;
@@ -2280,7 +2279,11 @@ struct passwd *getpwuid(int uid) p->pw_name = user_name; p->pw_gecos =get_extended_user_info (NameDisplay);if (!p->pw_gecos) - p->pw_gecos = unknown; +/* +* Data returned by getpwuid(3P) is treated as internal and +* must never be written to or freed. +*/ + p->pw_gecos = (char *)"unknown" ; p->pw_dir =NULL ; initialized =1 ;
diff.c +1 -2
@@ -7231,12 +7231,11 @@ size_t fill_textconv(struct repository *r,struct diff_filespec *df, char **outbuf) { - static char empty_str[] = ""; size_t size;if (!driver) {if (!DIFF_FILE_VALID (df)) { - *outbuf = empty_str; + *outbuf = (char *)"" ;return 0 ; }if (diff_populate_filespec (r, df,NULL ))
entry.c +10 -5
@@ -167,6 +167,11 @@ static int remove_available_paths(struct string_list_item *item, void *cb_data)return !available; } +static int string_is_not_null(struct string_list_item *item, void *data UNUSED) +{ +return !!item->string; +} +int finish_delayed_checkout (struct checkout *state,int show_progress) {int errs =0 ;
@@ -175,7 +180,6 @@ int finish_delayed_checkout(struct checkout *state, int show_progress)struct string_list_item *filter, *path;struct progress *progress =NULL ;struct delayed_checkout *dco = state->delayed_checkout; -char empty_str[] ="" ;if (!state->delayed_checkout)return errs;
@@ -190,7 +194,7 @@ int finish_delayed_checkout(struct checkout *state, int show_progress)if (!async_query_available_blobs (filter->string, &available_paths)) {/* Filter reported an error */ errs =1 ; - filter->string = empty_str; + filter->string =NULL ;continue ; }if (available_paths.nr <=0 ) {
@@ -200,7 +204,7 @@ int finish_delayed_checkout(struct checkout *state, int show_progress)* filter from the list (see * "string_list_remove_empty_items" call below). */ - filter->string = empty_str; + filter->string =NULL ;continue ; }
@@ -226,7 +230,7 @@ int finish_delayed_checkout(struct checkout *state, int show_progress)* Do not ask the filter for available blobs, * again, as the filter is likely buggy. */ - filter->string = empty_str; + filter->string =NULL ;continue ; } ce = index_file_exists(state->istate, path->string,
@@ -240,7 +244,8 @@ int finish_delayed_checkout(struct checkout *state, int show_progress) errs =1 ; } } -string_list_remove_empty_items (&dco->filters,0 ); + +filter_string_list (&dco->filters,0 , string_is_not_null,NULL ); }stop_progress (&progress);string_list_clear (&dco->filters,0 );
ident.c +2 -7
@@ -46,14 +46,9 @@ static struct passwd *xgetpwuid_self(int *is_bogus) pw =getpwuid (getuid ());if (!pw) {static struct passwd fallback; -static char fallback_name[] ="unknown" ; + fallback.pw_name = (char *)"unknown" ;#ifndef NO_GECOS_IN_PWENT -static char fallback_gcos[] ="Unknown" ; -#endif - - fallback.pw_name = fallback_name; -#ifndef NO_GECOS_IN_PWENT - fallback.pw_gecos = fallback_gcos; + fallback.pw_gecos = (char *)"Unknown" ;#endif pw = &fallback;if (is_bogus)
line-log.c +3 -2
@@ -1036,7 +1036,7 @@ static int process_diff_filepair(struct rev_info *rev,struct range_set tmp;struct diff_ranges diff;mmfile_t file_parent, file_target; -char empty_str[] ="" ; +char *parent_data_to_free =NULL ;assert (pair->two->path);while (rg) {
@@ -1061,7 +1061,7 @@ static int process_diff_filepair(struct rev_info *rev, file_parent.ptr = pair->one->data; file_parent.size = pair->one->size; }else { - file_parent.ptr = empty_str; + file_parent.ptr = parent_data_to_free =xstrdup ("" ); file_parent.size =0 ; }
@@ -1080,6 +1080,7 @@ static int process_diff_filepair(struct rev_info *rev,diff_ranges_release (&diff); +free (parent_data_to_free);return ((*diff_out)->parent.nr >0 ); }
object-file.c +7 -5
@@ -277,18 +277,17 @@ int hash_algo_by_length(int len)static struct cached_object {struct object_id oid;enum object_type type; -void *buf; +const void *buf;unsigned long size; } *cached_objects;static int cached_object_nr, cached_object_alloc; -static char empty_tree_buf[] ="" ;static struct cached_object empty_tree = { .oid = { .hash =EMPTY_TREE_SHA1_BIN_LITERAL , }, .type =OBJ_TREE , - .buf = empty_tree_buf, + .buf ="" , };static struct cached_object *find_cached_object (const struct object_id *oid)
@@ -1779,6 +1778,10 @@ int pretend_object_file(void *buf, unsigned long len, enum object_type type, struct object_id *oid) {struct cached_object *co; +char *co_buf; + + co_buf =xmalloc (len); +memcpy (co_buf, buf, len);hash_object_file (the_hash_algo, buf, len, type, oid); if (repo_has_object_file_with_flags(the_repository, oid, OBJECT_INFO_QUICK | OBJECT_INFO_SKIP_FETCH_OBJECT) ||
@@ -1788,8 +1791,7 @@ int pretend_object_file(void *buf, unsigned long len, enum object_type type, co = &cached_objects[cached_object_nr++]; co->size = len; co->type = type; - co->buf =xmalloc (len); -memcpy (co->buf, buf, len); + co->buf = co_buf;oidcpy (&co->oid, oid);return 0 ; }
pretty.c +2 -3
@@ -1583,10 +1583,9 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */return 1 ;case 'D' : { -char empty_str[] ="" ;const struct decoration_options opts = { - .prefix = empty_str, - .suffix = empty_str, + .prefix = (char *)"" , + .suffix = (char *)"" , };format_decorations (sb, commit, c->auto_color, &opts);
refs/reftable-backend.c +16 -13
@@ -1285,7 +1285,6 @@ static int write_copy_table(struct reftable_writer *writer, void *cb_data)struct strbuf errbuf =STRBUF_INIT ;size_t logs_nr =0 , logs_alloc =0 , i;const char *committer_info; -char head[] ="HEAD" ;int ret; committer_info =git_committer_info (0 );
@@ -1341,10 +1340,10 @@ static int write_copy_table(struct reftable_writer *writer, void *cb_data)* old reference. */ refs[0 ] = old_ref; - refs[0 ].refname = (char *)arg->newname; + refs[0 ].refname =xstrdup (arg->newname); refs[0 ].update_index = creation_ts;if (arg->delete_old) { - refs[1 ].refname = (char *)arg->oldname; + refs[1 ].refname =xstrdup (arg->oldname); refs[1 ].value_type =REFTABLE_REF_DELETION ; refs[1 ].update_index = deletion_ts; }
@@ -1367,7 +1366,7 @@ static int write_copy_table(struct reftable_writer *writer, void *cb_data)ALLOC_GROW (logs, logs_nr +1 , logs_alloc);memset (&logs[logs_nr],0 ,sizeof (logs[logs_nr]));fill_reftable_log_record (&logs[logs_nr], &committer_ident); - logs[logs_nr].refname = (char *)arg->newname; + logs[logs_nr].refname =xstrdup (arg->newname); logs[logs_nr].update_index = deletion_ts; logs[logs_nr].value.update.message =xstrndup (arg->logmsg, arg->refs->write_options.block_size /2 );
@@ -1388,7 +1387,13 @@ static int write_copy_table(struct reftable_writer *writer, void *cb_data)if (append_head_reflog) {ALLOC_GROW (logs, logs_nr +1 , logs_alloc); logs[logs_nr] = logs[logs_nr -1 ]; - logs[logs_nr].refname = head; + logs[logs_nr].refname =xstrdup ("HEAD" ); + logs[logs_nr].value.update.name = +xstrdup (logs[logs_nr].value.update.name); + logs[logs_nr].value.update.email = +xstrdup (logs[logs_nr].value.update.email); + logs[logs_nr].value.update.message = +xstrdup (logs[logs_nr].value.update.message); logs_nr++; } }
@@ -1399,7 +1404,7 @@ static int write_copy_table(struct reftable_writer *writer, void *cb_data)ALLOC_GROW (logs, logs_nr +1 , logs_alloc);memset (&logs[logs_nr],0 ,sizeof (logs[logs_nr]));fill_reftable_log_record (&logs[logs_nr], &committer_ident); - logs[logs_nr].refname = (char *)arg->newname; + logs[logs_nr].refname =xstrdup (arg->newname); logs[logs_nr].update_index = creation_ts; logs[logs_nr].value.update.message =xstrndup (arg->logmsg, arg->refs->write_options.block_size /2 );
@@ -1431,7 +1436,7 @@ static int write_copy_table(struct reftable_writer *writer, void *cb_data)*/ ALLOC_GROW (logs, logs_nr +1 , logs_alloc); logs[logs_nr] = old_log; - logs[logs_nr].refname = (char *)arg->newname; + logs[logs_nr].refname =xstrdup (arg->newname); logs_nr++;/*
@@ -1440,7 +1445,7 @@ static int write_copy_table(struct reftable_writer *writer, void *cb_data)if (arg->delete_old) {ALLOC_GROW (logs, logs_nr +1 , logs_alloc);memset (&logs[logs_nr],0 ,sizeof (logs[logs_nr])); - logs[logs_nr].refname = (char *)arg->oldname; + logs[logs_nr].refname =xstrdup (arg->oldname); logs[logs_nr].value_type =REFTABLE_LOG_DELETION ; logs[logs_nr].update_index = old_log.update_index; logs_nr++;
@@ -1463,13 +1468,11 @@ static int write_copy_table(struct reftable_writer *writer, void *cb_data)reftable_iterator_destroy (&it);string_list_clear (&skip,0 );strbuf_release (&errbuf); -for (i =0 ; i < logs_nr; i++) { -if (logs[i].refname == head) -continue ; - logs[i].refname =NULL ; +for (i =0 ; i < logs_nr; i++)reftable_log_record_release (&logs[i]); - }free (logs); +for (i =0 ; i <ARRAY_SIZE (refs); i++) +reftable_ref_record_release (&refs[i]);reftable_ref_record_release (&old_ref);reftable_log_record_release (&old_log);return ret;
reftable/basics.c +6 -9
@@ -67,9 +67,9 @@ void free_names(char **a)reftable_free (a); } -size_t names_length (char **names) +size_t names_length (const char **names) { -char **p = names; +const char **p = names;while (*p) p++;return p - names;
@@ -102,15 +102,12 @@ void parse_names(char *buf, int size, char ***namesp) *namesp = names; } -int names_equal (char **a,char **b) +int names_equal (const char **a,const char **b) { -int i =0 ; -for (; a[i] && b[i]; i++) { -if (strcmp (a[i], b[i])) { +size_t i =0 ; +for (; a[i] && b[i]; i++) +if (strcmp (a[i], b[i]))return 0 ; - } - } -return a[i] == b[i]; }
reftable/basics.h +2 -2
@@ -42,10 +42,10 @@ void free_names(char **a);void parse_names (char *buf,int size,char ***namesp);/* compares two NULL-terminated arrays of strings. */ -int names_equal (char **a,char **b); +int names_equal (const char **a,const char **b);/* returns the array size of a NULL-terminated array of strings. */ -size_t names_length (char **names); +size_t names_length (const char **names);/* Allocation routines; they invoke the functions set through * reftable_set_alloc() */
reftable/basics_test.c +1 -2
@@ -58,8 +58,7 @@ static void test_binsearch(void)static void test_names_length (void ) { -char a[] ="a" , b[] ="b" ; -char *names[] = { a, b,NULL }; +const char *names[] = {"a" ,"b" ,NULL };EXPECT (names_length (names) ==2 ); }
reftable/block_test.c +2 -2
@@ -19,7 +19,7 @@ license that can be found in the LICENSE file or atstatic void test_block_read_write (void ) {const int header_off =21 ;/* random */ -char *names[30 ], empty_str[] ="" ; +char *names[30 ];const int N =ARRAY_SIZE (names);const int block_size =1024 ;struct reftable_block block = {NULL };
@@ -42,7 +42,7 @@ static void test_block_read_write(void)block_writer_init (&bw,BLOCK_TYPE_REF , block.data, block_size, header_off,hash_size (GIT_SHA1_FORMAT_ID )); - rec.u.ref.refname = empty_str; + rec.u.ref.refname = (char *)"" ; rec.u.ref.value_type =REFTABLE_REF_DELETION ; n =block_writer_add (&bw, &rec);EXPECT (n ==REFTABLE_API_ERROR );
reftable/merged_test.c +23 -29
144 lines not on this page · raw message
reftable/readwrite_test.c +23 -37
139 lines not on this page · raw message
reftable/stack.c +6 -4
@@ -204,7 +204,8 @@ static struct reftable_reader **stack_copy_readers(struct reftable_stack *st,return cur; } -static int reftable_stack_reload_once (struct reftable_stack *st,char **names, +static int reftable_stack_reload_once (struct reftable_stack *st, +const char **names,int reuse_open) {size_t cur_len = !st->merged ?0 : st->merged->stack_len;
@@ -222,7 +223,7 @@ static int reftable_stack_reload_once(struct reftable_stack *st, char **names,while (*names) {struct reftable_reader *rd =NULL ; -char *name = *names++; +const char *name = *names++;/* this is linear; we assume compaction keeps the number of tables under control so this is not quadratic. */
@@ -354,7 +355,7 @@ static int reftable_stack_reload_maybe_reuse(struct reftable_stack *st, goto out; } - err =reftable_stack_reload_once (st, names, reuse_open); + err =reftable_stack_reload_once (st, (const char **) names, reuse_open);if (!err)break ;if (err !=REFTABLE_NOT_EXIST_ERROR )
@@ -368,7 +369,8 @@ static int reftable_stack_reload_maybe_reuse(struct reftable_stack *st, err =read_lines (st->list_file, &names_after);if (err <0 ) goto out; -if (names_equal (names_after, names)) { +if (names_equal ((const char **) names_after, + (const char **) names)) { err =REFTABLE_NOT_EXIST_ERROR ; goto out; }
reftable/stack_test.c +38 -47
226 lines not on this page · raw message
Signature · 1 line
2.45.1.410.g58bac47f8e.dirty
PATCH v3 1/27 global: improve const correctness when assigning string constants
We're about to enable -Wwrite-strings, which changes the type of string constants to const char[]. Fix various sites where we assign such constants to non-const variables.
--- builtin/bisect.c | 3 ++- builtin/blame.c | 2 +- builtin/bugreport.c | 2 +- builtin/check-ignore.c | 4 +-- builtin/clone.c | 6 ++--- builtin/commit.c | 6 ++--- builtin/diagnose.c | 2 +- builtin/log.c | 2 +- builtin/mailsplit.c | 4 +-- builtin/pull.c | 52 ++++++++++++++++++------------------ builtin/receive-pack.c | 4 +-- builtin/revert.c | 2 +- compat/regex/regcomp.c | 2 +- diff.c | 4 +-- diffcore-rename.c | 6 ++--- fmt-merge-msg.c | 2 +- fsck.c | 2 +- fsck.h | 2 +- gpg-interface.c | 2 +- http-backend.c | 2 +- imap-send.c | 6 ++--- pretty.c | 2 +- refs.c | 2 +- refs.h | 2 +- reftable/basics.c | 15 +++++------ reftable/basics.h | 4 +-- reftable/basics_test.c | 4 +-- reftable/record.c | 6 ++--- reftable/stack.c | 10 ++++--- reftable/stack_test.c | 8 +++--- run-command.c | 2 +- t/helper/test-hashmap.c | 3 ++- t/helper/test-json-writer.c | 10 +++---- t/helper/test-regex.c | 4 +-- t/helper/test-rot13-filter.c | 5 ++-- t/unit-tests/t-strbuf.c | 10 ++++--- trailer.c | 2 +- wt-status.c | 2 +- 38 files changed, 106 insertions(+), 102 deletions(-)
builtin/bisect.c +2 -1
@@ -262,7 +262,8 @@ static int bisect_reset(const char *commit)return bisect_clean_state (); } -static void log_commit (FILE *fp,char *fmt,const char *state, +static void log_commit (FILE *fp, +const char *fmt,const char *state,struct commit *commit) {struct pretty_print_context pp = {0 };
builtin/blame.c +1 -1
@@ -134,7 +134,7 @@ static void get_ac_line(const char *inbuf, const char *what, {struct ident_split ident;size_t len, maillen, namelen; -char *tmp, *endp; +const char *tmp, *endp;const char *namebuf, *mailbuf; tmp =strstr (inbuf, what);
builtin/bugreport.c +1 -1
@@ -107,7 +107,7 @@ int cmd_bugreport(int argc, const char **argv, const char *prefix)struct tm tm;enum diagnose_mode diagnose =DIAGNOSE_NONE ;char *option_output =NULL ; -char *option_suffix ="%Y-%m-%d-%H%M" ; +const char *option_suffix ="%Y-%m-%d-%H%M" ;const char *user_relative_path =NULL ;char *prefixed_filename;size_t output_path_len;
builtin/check-ignore.c +2 -2
@@ -35,8 +35,8 @@ static const struct option check_ignore_options[] = {static void output_pattern (const char *path,struct path_pattern *pattern) { -char *bang = (pattern && pattern->flags &PATTERN_FLAG_NEGATIVE ) ?"!" :"" ; -char *slash = (pattern && pattern->flags &PATTERN_FLAG_MUSTBEDIR ) ?"/" :"" ; +const char *bang = (pattern && pattern->flags &PATTERN_FLAG_NEGATIVE ) ?"!" :"" ; +const char *slash = (pattern && pattern->flags &PATTERN_FLAG_MUSTBEDIR ) ?"/" :"" ;if (!nul_term_line) {if (!verbose) {write_name_quoted (path, stdout,'\n' );
builtin/clone.c +3 -3
@@ -71,7 +71,7 @@ static char *option_branch = NULL;static struct string_list option_not =STRING_LIST_INIT_NODUP ;static const char *real_git_dir;static const char *ref_format; -static char *option_upload_pack ="git-upload-pack" ; +static const char *option_upload_pack ="git-upload-pack" ;static int option_verbosity;static int option_progress =-1 ;static int option_sparse_checkout;
@@ -177,8 +177,8 @@ static struct option builtin_clone_options[] = {static const char *get_repo_path_1 (struct strbuf *path,int *is_bundle) { -static char *suffix[] = {"/.git" ,"" ,".git/.git" ,".git" }; -static char *bundle_suffix[] = {".bundle" ,"" }; +static const char *suffix[] = {"/.git" ,"" ,".git/.git" ,".git" }; +static const char *bundle_suffix[] = {".bundle" ,"" };size_t baselen = path->len;struct stat st;int i;
builtin/commit.c +3 -3
@@ -113,7 +113,7 @@ static char *template_file;* the commit message and/or authorship. */ static const char *author_message, *author_message_buffer; -static char *edit_message, *use_message; +static const char *edit_message, *use_message;static char *fixup_message, *fixup_commit, *squash_message;static const char *fixup_prefix;static int all, also, interactive, patch_interactive, only, amend, signoff;
@@ -121,8 +121,8 @@ static int edit_flag = -1; /* unspecified */static int quiet, verbose, no_verify, allow_empty, dry_run, renew_authorship;static int config_commit_verbose =-1 ;/* unspecified */ static int no_post_rewrite, allow_empty_message, pathspec_file_nul; -static char *untracked_files_arg, *force_date, *ignore_submodule_arg, *ignored_arg; -static char *sign_commit, *pathspec_from_file; +static const char *untracked_files_arg, *force_date, *ignore_submodule_arg, *ignored_arg; +static const char *sign_commit, *pathspec_from_file;static struct strvec trailer_args =STRVEC_INIT ;/*
builtin/diagnose.c +1 -1
@@ -18,7 +18,7 @@ int cmd_diagnose(int argc, const char **argv, const char *prefix)struct tm tm;enum diagnose_mode mode =DIAGNOSE_STATS ;char *option_output =NULL ; -char *option_suffix ="%Y-%m-%d-%H%M" ; +const char *option_suffix ="%Y-%m-%d-%H%M" ;char *prefixed_filename;const struct option diagnose_options[] = {
builtin/log.c +1 -1
@@ -1283,7 +1283,7 @@ static void get_patch_ids(struct rev_info *rev, struct patch_ids *ids) o2->flags = flags2; } -static void gen_message_id (struct rev_info *info,char *base) +static void gen_message_id (struct rev_info *info,const char *base) {struct strbuf buf =STRBUF_INIT ; strbuf_addf(&buf, "%s.%"PRItime".git.%s", base,
builtin/mailsplit.c +2 -2
@@ -113,8 +113,8 @@ static int populate_maildir_list(struct string_list *list, const char *path)DIR *dir;struct dirent *dent;char *name =NULL ; -char *subs[] = {"cur" ,"new" ,NULL }; -char **sub; +const char *subs[] = {"cur" ,"new" ,NULL }; +const char **sub;int ret =-1 ;for (sub = subs; *sub; ++sub) {
builtin/pull.c +26 -26
74 lines not on this page · raw message
builtin/receive-pack.c +2 -2
@@ -1249,7 +1249,7 @@ static int run_proc_receive_hook(struct command *commands,return code; } -static char *refuse_unconfigured_deny_msg = +static const char *refuse_unconfigured_deny_msg =N_ ("By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" "with what you pushed, and will require 'git reset --hard' to match\n"
@@ -1269,7 +1269,7 @@ static void refuse_unconfigured_deny(void)rp_error ("%s" ,_ (refuse_unconfigured_deny_msg)); } -static char *refuse_unconfigured_deny_delete_current_msg = +static const char *refuse_unconfigured_deny_delete_current_msg =N_ ("By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" "\n"
builtin/revert.c +1 -1
@@ -179,7 +179,7 @@ static int run_sequencer(int argc, const char **argv, const char *prefix,/* Check for incompatible command line arguments */ if (cmd) { -char *this_operation; +const char *this_operation;if (cmd =='q' ) this_operation ="--quit" ;else if (cmd =='c' )
compat/regex/regcomp.c +1 -1
@@ -848,7 +848,7 @@ init_dfa (re_dfa_t *dfa, size_t pat_len) {unsigned int table_size;#ifndef _LIBC -char *codeset_name; +const char *codeset_name;#endif memset (dfa,'\0' ,sizeof (re_dfa_t));
diff.c +2 -2
@@ -3764,7 +3764,7 @@ static void builtin_diff(const char *name_a,return ; } -static char *get_compact_summary (const struct diff_filepair *p,int is_renamed) +static const char *get_compact_summary (const struct diff_filepair *p,int is_renamed) {if (!is_renamed) {if (p->status ==DIFF_STATUS_ADDED ) {
@@ -4076,7 +4076,7 @@ static int reuse_worktree_file(struct index_state *istate,static int diff_populate_gitlink (struct diff_filespec *s,int size_only) {struct strbuf buf =STRBUF_INIT ; -char *dirty ="" ; +const char *dirty ="" ;/* Are we looking at the work tree? */ if (s->dirty_submodule)
diffcore-rename.c +3 -3
@@ -406,7 +406,7 @@ static const char *get_highest_rename_path(struct strintmap *counts)return highest_destination_dir; } -static char *UNKNOWN_DIR ="/" ;/* placeholder -- short, illegal directory */ +static const char *UNKNOWN_DIR ="/" ;/* placeholder -- short, illegal directory */ static int dir_rename_already_determinable (struct strintmap *counts) {
@@ -429,8 +429,8 @@ static int dir_rename_already_determinable(struct strintmap *counts) }static void increment_count (struct dir_rename_info *info, -char *old_dir, -char *new_dir) +const char *old_dir, +const char *new_dir) {struct strintmap *counts;struct strmap_entry *e;
fmt-merge-msg.c +1 -1
@@ -447,7 +447,7 @@ static void fmt_merge_msg_title(struct strbuf *out, const char *current_branch) {int i =0 ; -char *sep ="" ; +const char *sep ="" ;strbuf_addstr (out,"Merge " );for (i =0 ; i < srcs.nr; i++) {
fsck.c +1 -1
@@ -1231,7 +1231,7 @@ int fsck_object(struct object *obj, void *data, unsigned long size, }int fsck_buffer (const struct object_id *oid,enum object_type type, -void *data,unsigned long size, +const void *data,unsigned long size,struct fsck_options *options) {if (type ==OBJ_BLOB )
fsck.h +1 -1
@@ -202,7 +202,7 @@ int fsck_object(struct object *obj, void *data, unsigned long size,* struct. */ int fsck_buffer (const struct object_id *oid,enum object_type , -void *data,unsigned long size, +const void *data,unsigned long size,struct fsck_options *options);/*
gpg-interface.c +1 -1
@@ -727,7 +727,7 @@ static int git_gpg_config(const char *var, const char *value, void *cb UNUSED) {struct gpg_format *fmt =NULL ; -char *fmtname =NULL ; +const char *fmtname =NULL ;char *trust;int ret;
http-backend.c +1 -1
@@ -753,7 +753,7 @@ static int bad_request(struct strbuf *hdr, const struct service_cmd *c) int cmd_main(int argc UNUSED, const char **argv UNUSED) { -char *method =getenv ("REQUEST_METHOD" ); +const char *method =getenv ("REQUEST_METHOD" );const char *proto_header;char *dir;struct service_cmd *cmd =NULL ;
imap-send.c +3 -3
@@ -1215,9 +1215,9 @@ static int imap_store_msg(struct imap_store *ctx, struct strbuf *msg)static void wrap_in_html (struct strbuf *msg) {struct strbuf buf =STRBUF_INIT ; -static char *content_type ="Content-Type: text/html;\n" ; -static char *pre_open ="<pre>\n" ; -static char *pre_close ="</pre>\n" ; +static const char *content_type ="Content-Type: text/html;\n" ; +static const char *pre_open ="<pre>\n" ; +static const char *pre_close ="</pre>\n" ;const char *body =strstr (msg->buf,"\n\n" );if (!body)
pretty.c +1 -1
@@ -1325,7 +1325,7 @@ int format_set_trailers_options(struct process_trailer_options *opts, static size_t parse_describe_args(const char *start, struct strvec *args) { struct { - char *name; + const char *name; enum { DESCRIBE_ARG_BOOL, DESCRIBE_ARG_INTEGER,
refs.c +1 -1
@@ -159,7 +159,7 @@ void update_ref_namespace(enum ref_namespace namespace, char *ref) {struct ref_namespace_info *info = &ref_namespace[namespace];if (info->ref_updated) -free (info->ref); +free ((char *)info->ref); info->ref = ref; info->ref_updated =1 ; }
refs.h +1 -1
@@ -975,7 +975,7 @@ struct ref_store *get_worktree_ref_store(const struct worktree *wt);*/ struct ref_namespace_info { -char *ref; +const char *ref;enum decoration_type decoration;/*
reftable/basics.c +6 -9
@@ -67,9 +67,9 @@ void free_names(char **a)reftable_free (a); } -size_t names_length (char **names) +size_t names_length (const char **names) { -char **p = names; +const char **p = names;while (*p) p++;return p - names;
@@ -102,15 +102,12 @@ void parse_names(char *buf, int size, char ***namesp) *namesp = names; } -int names_equal (char **a,char **b) +int names_equal (const char **a,const char **b) { -int i =0 ; -for (; a[i] && b[i]; i++) { -if (strcmp (a[i], b[i])) { +size_t i =0 ; +for (; a[i] && b[i]; i++) +if (strcmp (a[i], b[i]))return 0 ; - } - } -return a[i] == b[i]; }
reftable/basics.h +2 -2
@@ -42,10 +42,10 @@ void free_names(char **a);void parse_names (char *buf,int size,char ***namesp);/* compares two NULL-terminated arrays of strings. */ -int names_equal (char **a,char **b); +int names_equal (const char **a,const char **b);/* returns the array size of a NULL-terminated array of strings. */ -size_t names_length (char **names); +size_t names_length (const char **names);/* Allocation routines; they invoke the functions set through * reftable_set_alloc() */
reftable/basics_test.c +2 -2
@@ -58,8 +58,8 @@ static void test_binsearch(void)static void test_names_length (void ) { -char *a[] = {"a" ,"b" ,NULL }; -EXPECT (names_length (a) ==2 ); +const char *names[] = {"a" ,"b" ,NULL }; +EXPECT (names_length (names) ==2 ); }static void test_parse_names_normal (void )
reftable/record.c +3 -3
@@ -116,7 +116,7 @@ static int decode_string(struct strbuf *dest, struct string_view in)return start_len - in.len; } -static int encode_string (char *str,struct string_view s) +static int encode_string (const char *str,struct string_view s) {struct string_view start = s;int l =strlen (str);
@@ -969,9 +969,9 @@ static int reftable_log_record_decode(void *rec, struct strbuf key,return REFTABLE_FORMAT_ERROR ; } -static int null_streq (char *a,char *b) +static int null_streq (const char *a,const char *b) { -char *empty ="" ; +const char *empty ="" ;if (!a) a = empty;
reftable/stack.c +6 -4
@@ -204,7 +204,8 @@ static struct reftable_reader **stack_copy_readers(struct reftable_stack *st,return cur; } -static int reftable_stack_reload_once (struct reftable_stack *st,char **names, +static int reftable_stack_reload_once (struct reftable_stack *st, +const char **names,int reuse_open) {size_t cur_len = !st->merged ?0 : st->merged->stack_len;
@@ -222,7 +223,7 @@ static int reftable_stack_reload_once(struct reftable_stack *st, char **names,while (*names) {struct reftable_reader *rd =NULL ; -char *name = *names++; +const char *name = *names++;/* this is linear; we assume compaction keeps the number of tables under control so this is not quadratic. */
@@ -354,7 +355,7 @@ static int reftable_stack_reload_maybe_reuse(struct reftable_stack *st, goto out; } - err =reftable_stack_reload_once (st, names, reuse_open); + err =reftable_stack_reload_once (st, (const char **) names, reuse_open);if (!err)break ;if (err !=REFTABLE_NOT_EXIST_ERROR )
@@ -368,7 +369,8 @@ static int reftable_stack_reload_maybe_reuse(struct reftable_stack *st, err =read_lines (st->list_file, &names_after);if (err <0 ) goto out; -if (names_equal (names_after, names)) { +if (names_equal ((const char **) names_after, + (const char **) names)) { err =REFTABLE_NOT_EXIST_ERROR ; goto out; }
reftable/stack_test.c +4 -4
@@ -83,7 +83,7 @@ static void test_read_file(void)char out[1024 ] ="line1\n\nline2\nline3" ;int n, err;char **names =NULL ; -char *want[] = {"line1" ,"line2" ,"line3" }; +const char *want[] = {"line1" ,"line2" ,"line3" };int i =0 ;EXPECT (fd >0 );
@@ -116,9 +116,9 @@ static void test_parse_names(void)static void test_names_equal (void ) { -char *a[] = {"a" ,"b" ,"c" ,NULL }; -char *b[] = {"a" ,"b" ,"d" ,NULL }; -char *c[] = {"a" ,"b" ,NULL }; +const char *a[] = {"a" ,"b" ,"c" ,NULL }; +const char *b[] = {"a" ,"b" ,"d" ,NULL }; +const char *c[] = {"a" ,"b" ,NULL };EXPECT (names_equal (a, a));EXPECT (!names_equal (a, b));
run-command.c +1 -1
@@ -663,7 +663,7 @@ int start_command(struct child_process *cmd)int need_in, need_out, need_err;int fdin[2 ], fdout[2 ], fderr[2 ];int failed_errno; -char *str; +const char *str;/* * In case of errors we must keep the promise to close FDs
t/helper/test-hashmap.c +2 -1
@@ -36,7 +36,8 @@ static int test_entry_cmp(const void *cmp_data, }static struct test_entry *alloc_test_entry (unsigned int hash, -char *key,char *value) +const char *key, +const char *value) {size_t klen =strlen (key);size_t vlen =strlen (value);
t/helper/test-json-writer.c +5 -5
@@ -174,7 +174,7 @@ static void make_arr4(int pretty)jw_end (&arr4); } -static char *expect_nest1 = +static const char *expect_nest1 ="{\"obj1\":{\"a\":\"abc\",\"b\":42,\"c\":true},\"arr1\":[\"abc\",42,true]}" ;static struct json_writer nest1 =JSON_WRITER_INIT ;
@@ -195,10 +195,10 @@ static void make_nest1(int pretty)jw_release (&arr1); } -static char *expect_inline1 = +static const char *expect_inline1 ="{\"obj1\":{\"a\":\"abc\",\"b\":42,\"c\":true},\"arr1\":[\"abc\",42,true]}" ; -static char *pretty_inline1 = +static const char *pretty_inline1 = ("{\n" " \"obj1\": {\n" " \"a\": \"abc\",\n"
@@ -236,10 +236,10 @@ static void make_inline1(int pretty)jw_end (&inline1); } -static char *expect_inline2 = +static const char *expect_inline2 ="[[1,2],[3,4],{\"a\":\"abc\"}]" ; -static char *pretty_inline2 = +static const char *pretty_inline2 = ("[\n" " [\n" " 1,\n"
t/helper/test-regex.c +2 -2
@@ -20,8 +20,8 @@ static struct reg_flag reg_flags[] = {static int test_regex_bug (void ) { -char *pat ="[^={} \t]+" ; -char *str ="={}\nfred" ; +const char *pat ="[^={} \t]+" ; +const char *str ="={}\nfred" ;regex_t r;regmatch_t m[1 ];
t/helper/test-rot13-filter.c +3 -2
@@ -136,7 +136,7 @@ static void free_delay_entries(void)strmap_clear (&delay,0 ); } -static void add_delay_entry (char *pathname,int count,int requested) +static void add_delay_entry (const char *pathname,int count,int requested) {struct delay_entry *entry =xcalloc (1 ,sizeof (*entry)); entry->count = count;
@@ -189,7 +189,8 @@ static void reply_list_available_blobs_cmd(void)static void command_loop (void ) {for (;;) { -char *buf, *output; +char *buf; +const char *output;char *pathname;struct delay_entry *entry;struct strbuf input =STRBUF_INIT ;
t/unit-tests/t-strbuf.c +6 -4
@@ -2,7 +2,8 @@#include "strbuf.h" /* wrapper that supplies tests with an empty, initialized strbuf */ -static void setup (void (*f)(struct strbuf *,void *),void *data) +static void setup (void (*f)(struct strbuf *,const void *), +const void *data) {struct strbuf buf =STRBUF_INIT ;
@@ -13,7 +14,8 @@ static void setup(void (*f)(struct strbuf*, void*), void *data) }/* wrapper that supplies tests with a populated, initialized strbuf */ -static void setup_populated (void (*f)(struct strbuf *,void *),char *init_str,void *data) +static void setup_populated (void (*f)(struct strbuf *,const void *), +const char *init_str,const void *data) {struct strbuf buf =STRBUF_INIT ;
@@ -64,7 +66,7 @@ static void t_dynamic_init(void)strbuf_release (&buf); } -static void t_addch (struct strbuf *buf,void *data) +static void t_addch (struct strbuf *buf,const void *data) {const char *p_ch = data;const char ch = *p_ch;
@@ -83,7 +85,7 @@ static void t_addch(struct strbuf *buf, void *data) check_char(buf->buf[buf->len], ==, '\0'); } -static void t_addstr (struct strbuf *buf,void *data) +static void t_addstr (struct strbuf *buf,const void *data) {const char *text = data;size_t len =strlen (text);
trailer.c +1 -1
@@ -63,7 +63,7 @@ struct arg_item {static LIST_HEAD (conf_head); -static char *separators =":" ; +static const char *separators =":" ;static int configured;
wt-status.c +1 -1
@@ -2408,7 +2408,7 @@ static void wt_porcelain_v2_print_unmerged_entry(int mode;struct object_id oid; } stages[3 ]; -char *key; +const char *key;char submodule_token[5 ];char unmerged_prefix ='u' ;char eol_char = s->null_termination ?'\0' :'\n' ;
Signature · 1 line
2.45.1.410.g58bac47f8e.dirty
PATCH v3 2/27 global: convert intentionally-leaking config strings to consts
In reply to Patrick SteinhardtThere are multiple cases where we intentionally leak config strings:
- struct gpg_format is used to track programs that can be used for signing commits, either via gpg(1), gpgsm(1) or ssh-keygen(1). The user can override the commands via several config variables. As the array is populated once, only, and the struct memers are never written to or free'd.
- struct ll_merge_driver is used to track merge drivers. Same as with the GPG format, these drivers are populated once and then reused. Its data is never written to or free'd, either.
- struct userdiff_funcname and struct userdiff_driver can be configured via diff.<driver>.* to add additional drivers. Again, these have a global lifetime and are never written to or free'd.
All of these are intentionally kept alive and are never written to. Furthermore, all of these are being assigned both string constants in some places, and allocated strings in other places. This will cause warnings once we enable -Wwrite-strings, so let's mark the respective fields as const char * and cast away the constness when assigning those values.
--- gpg-interface.c | 4 ++-- merge-ll.c | 11 ++++++++--- userdiff.c | 10 +++++----- userdiff.h | 12 ++++++------ 4 files changed, 21 insertions(+), 16 deletions(-)
gpg-interface.c +2 -2
@@ -34,7 +34,7 @@ static enum signature_trust_level configured_min_trust_level = TRUST_UNDEFINED;struct gpg_format {const char *name; -char *program; +const char *program;const char **verify_args;const char **sigs; int (*verify_signed_buffer)(struct signature_check *sigc,
@@ -783,7 +783,7 @@ static int git_gpg_config(const char *var, const char *value,if (fmtname) { fmt =get_format_by_name (fmtname); -return git_config_string (&fmt->program, var, value); +return git_config_string ((char **) &fmt->program, var, value); }return 0 ;
merge-ll.c +8 -3
@@ -27,7 +27,7 @@ typedef enum ll_merge_result (*ll_merge_fn)(const struct ll_merge_driver *,struct ll_merge_driver {const char *name; -char *description; +const char *description;ll_merge_fn fn;char *recursive;struct ll_merge_driver *next;
@@ -304,8 +304,13 @@ static int read_merge_config(const char *var, const char *value, ll_user_merge_tail = &(fn->next); } -if (!strcmp ("name" , key)) -return git_config_string (&fn->description, var, value); +if (!strcmp ("name" , key)) { +/* +* The description is leaking, but that's okay as we want to +* keep around the merge drivers anyway. +*/ +return git_config_string ((char **) &fn->description, var, value); + }if (!strcmp ("driver" , key)) {if (!value)
userdiff.c +5 -5
@@ -399,7 +399,7 @@ static struct userdiff_driver *userdiff_find_by_namelen(const char *name, size_tstatic int parse_funcname (struct userdiff_funcname *f,const char *k,const char *v,int cflags) { -if (git_config_string (&f->pattern, k, v) <0 ) +if (git_config_string ((char **) &f->pattern, k, v) <0 )return -1 ; f->cflags = cflags;return 0 ;
@@ -445,15 +445,15 @@ int userdiff_config(const char *k, const char *v)if (!strcmp (type,"binary" ))return parse_tristate (&drv->binary, k, v);if (!strcmp (type,"command" )) -return git_config_string (&drv->external, k, v); +return git_config_string ((char **) &drv->external, k, v);if (!strcmp (type,"textconv" )) -return git_config_string (&drv->textconv, k, v); +return git_config_string ((char **) &drv->textconv, k, v);if (!strcmp (type,"cachetextconv" ))return parse_bool (&drv->textconv_want_cache, k, v);if (!strcmp (type,"wordregex" )) -return git_config_string (&drv->word_regex, k, v); +return git_config_string ((char **) &drv->word_regex, k, v);if (!strcmp (type,"algorithm" )) -return git_config_string (&drv->algorithm, k, v); +return git_config_string ((char **) &drv->algorithm, k, v);return 0 ; }
userdiff.h +6 -6
@@ -7,19 +7,19 @@ struct index_state;struct repository ;struct userdiff_funcname { -char *pattern; +const char *pattern;int cflags; };struct userdiff_driver {const char *name; -char *external; -char *algorithm; +const char *external; +const char *algorithm;int binary;struct userdiff_funcname funcname; -char *word_regex; -char *word_regex_multi_byte; -char *textconv; +const char *word_regex; +const char *word_regex_multi_byte; +const char *textconv;struct notes_cache *textconv_cache;int textconv_want_cache; };
Signature · 1 line
2.45.1.410.g58bac47f8e.dirty
PATCH v3 3/27 refs/reftable: stop micro-optimizing refname allocations on copy
In reply to Patrick SteinhardtWhen copying refs, we execute write_copy_table() to write the new table. As the names arge given to use via arg->newname and arg->oldname, respectively, we optimize away some allocations by assigning those fields to the reftable records we are about to write. This requires us to cast the input to char * pointers as they are in fact constant strings. Later on, we then unset the refname for all of the records before calling reftable_log_record_release() on them.
We also do this when assigning the "HEAD" constant, but here we do not cast because its type is char[] by default. It's about to be turned into const char * though once we enable -Wwrite-strings and will thus cause another warning.
It's quite dubious whether this micro-optimization really helps. We're about to write to disk anyway, which is going to be way slower than a small handful of allocations. Let's drop the optimization altogther and instead copy arguments to simplify the code and avoid the future warning with -Wwrite-strings.
--- refs/reftable-backend.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-)
refs/reftable-backend.c +16 -12
@@ -1340,10 +1340,10 @@ static int write_copy_table(struct reftable_writer *writer, void *cb_data)* old reference. */ refs[0 ] = old_ref; - refs[0 ].refname = (char *)arg->newname; + refs[0 ].refname =xstrdup (arg->newname); refs[0 ].update_index = creation_ts;if (arg->delete_old) { - refs[1 ].refname = (char *)arg->oldname; + refs[1 ].refname =xstrdup (arg->oldname); refs[1 ].value_type =REFTABLE_REF_DELETION ; refs[1 ].update_index = deletion_ts; }
@@ -1366,7 +1366,7 @@ static int write_copy_table(struct reftable_writer *writer, void *cb_data)ALLOC_GROW (logs, logs_nr +1 , logs_alloc);memset (&logs[logs_nr],0 ,sizeof (logs[logs_nr]));fill_reftable_log_record (&logs[logs_nr], &committer_ident); - logs[logs_nr].refname = (char *)arg->newname; + logs[logs_nr].refname =xstrdup (arg->newname); logs[logs_nr].update_index = deletion_ts; logs[logs_nr].value.update.message =xstrndup (arg->logmsg, arg->refs->write_options.block_size /2 );
@@ -1387,7 +1387,13 @@ static int write_copy_table(struct reftable_writer *writer, void *cb_data)if (append_head_reflog) {ALLOC_GROW (logs, logs_nr +1 , logs_alloc); logs[logs_nr] = logs[logs_nr -1 ]; - logs[logs_nr].refname ="HEAD" ; + logs[logs_nr].refname =xstrdup ("HEAD" ); + logs[logs_nr].value.update.name = +xstrdup (logs[logs_nr].value.update.name); + logs[logs_nr].value.update.email = +xstrdup (logs[logs_nr].value.update.email); + logs[logs_nr].value.update.message = +xstrdup (logs[logs_nr].value.update.message); logs_nr++; } }
@@ -1398,7 +1404,7 @@ static int write_copy_table(struct reftable_writer *writer, void *cb_data)ALLOC_GROW (logs, logs_nr +1 , logs_alloc);memset (&logs[logs_nr],0 ,sizeof (logs[logs_nr]));fill_reftable_log_record (&logs[logs_nr], &committer_ident); - logs[logs_nr].refname = (char *)arg->newname; + logs[logs_nr].refname =xstrdup (arg->newname); logs[logs_nr].update_index = creation_ts; logs[logs_nr].value.update.message =xstrndup (arg->logmsg, arg->refs->write_options.block_size /2 );
@@ -1430,7 +1436,7 @@ static int write_copy_table(struct reftable_writer *writer, void *cb_data)*/ ALLOC_GROW (logs, logs_nr +1 , logs_alloc); logs[logs_nr] = old_log; - logs[logs_nr].refname = (char *)arg->newname; + logs[logs_nr].refname =xstrdup (arg->newname); logs_nr++;/*
@@ -1439,7 +1445,7 @@ static int write_copy_table(struct reftable_writer *writer, void *cb_data)if (arg->delete_old) {ALLOC_GROW (logs, logs_nr +1 , logs_alloc);memset (&logs[logs_nr],0 ,sizeof (logs[logs_nr])); - logs[logs_nr].refname = (char *)arg->oldname; + logs[logs_nr].refname =xstrdup (arg->oldname); logs[logs_nr].value_type =REFTABLE_LOG_DELETION ; logs[logs_nr].update_index = old_log.update_index; logs_nr++;
@@ -1462,13 +1468,11 @@ static int write_copy_table(struct reftable_writer *writer, void *cb_data)reftable_iterator_destroy (&it);string_list_clear (&skip,0 );strbuf_release (&errbuf); -for (i =0 ; i < logs_nr; i++) { -if (!strcmp (logs[i].refname,"HEAD" )) -continue ; - logs[i].refname =NULL ; +for (i =0 ; i < logs_nr; i++)reftable_log_record_release (&logs[i]); - }free (logs); +for (i =0 ; i <ARRAY_SIZE (refs); i++) +reftable_ref_record_release (&refs[i]);reftable_ref_record_release (&old_ref);reftable_log_record_release (&old_log);return ret;
Signature · 1 line
2.45.1.410.g58bac47f8e.dirty
PATCH v3 4/27 reftable: cast away constness when assigning constants to records
In reply to Patrick SteinhardtThe reftable records are used in multiple ways throughout the reftable library. In many of those cases they merely act as input to a function without getting modified by it at all. Most importantly, this happens when writing records and when querying for records.
We rely on this in our tests and thus assign string constants to those fields, which is about to generate warnings as those fields are of type char *. While we could go through the process and instead allocate those strings in all of our tests, this feels quite unnecessary.
Instead, add casts to char * for all of those strings. As this is part of our tests, this also nicely serves as a demonstration that nothing writes or frees those string constants, which would otherwise lead to segfaults.
--- reftable/block_test.c | 2 +- reftable/merged_test.c | 44 +++++++++++++++++------------------ reftable/readwrite_test.c | 32 +++++++++++++------------- reftable/stack_test.c | 48 +++++++++++++++++++-------------------- 4 files changed, 63 insertions(+), 63 deletions(-)
reftable/block_test.c +1 -1
@@ -42,7 +42,7 @@ static void test_block_read_write(void)block_writer_init (&bw,BLOCK_TYPE_REF , block.data, block_size, header_off,hash_size (GIT_SHA1_FORMAT_ID )); - rec.u.ref.refname ="" ; + rec.u.ref.refname = (char *)"" ; rec.u.ref.value_type =REFTABLE_REF_DELETION ; n =block_writer_add (&bw, &rec);EXPECT (n ==REFTABLE_API_ERROR );
reftable/merged_test.c +22 -22
126 lines not on this page · raw message
reftable/readwrite_test.c +16 -16
@@ -86,7 +86,7 @@ static void write_table(char ***names, struct strbuf *buf, int N, log.update_index = update_index; log.value_type =REFTABLE_LOG_UPDATE ;set_test_hash (log.value.update.new_hash, i); - log.value.update.message ="message" ; + log.value.update.message = (char *)"message" ; n =reftable_writer_add_log (w, &log);EXPECT (n ==0 );
@@ -118,15 +118,15 @@ static void test_log_buffer_size(void)int err;int i;struct reftable_log_record - log = { .refname ="refs/heads/master" , + log = { .refname = (char *)"refs/heads/master" , .update_index =0xa , .value_type =REFTABLE_LOG_UPDATE , .value = { .update = { - .name ="Han-Wen Nienhuys" , - .email ="[email protected]" , + .name = (char *)"Han-Wen Nienhuys" , + .email = (char *)"[email protected]" , .tz_offset =100 , .time =0x5e430672 , - .message ="commit: 9\n" , + .message = (char *)"commit: 9\n" , } } };struct reftable_writer *w =reftable_new_writer (&strbuf_add_void, &noop_flush, &buf, &opts);
@@ -156,15 +156,15 @@ static void test_log_overflow(void) };int err;struct reftable_log_record log = { - .refname ="refs/heads/master" , + .refname = (char *)"refs/heads/master" , .update_index =0xa , .value_type =REFTABLE_LOG_UPDATE , .value = { .update = { .old_hash = {1 }, .new_hash = {2 }, - .name ="Han-Wen Nienhuys" , - .email ="[email protected]" , + .name = (char *)"Han-Wen Nienhuys" , + .email = (char *)"[email protected]" , .tz_offset =100 , .time =0x5e430672 , .message = msg,
@@ -293,14 +293,14 @@ static void test_log_zlib_corruption(void)char message[100 ] = {0 };int err, i, n;struct reftable_log_record log = { - .refname ="refname" , + .refname = (char *)"refname" , .value_type =REFTABLE_LOG_UPDATE , .value = { .update = { .new_hash = {1 }, .old_hash = {2 }, - .name ="My Name" , - .email ="myname@invalid" , + .name = (char *)"My Name" , + .email = (char *)"myname@invalid" , .message = message, }, },
@@ -728,7 +728,7 @@ static void test_write_empty_key(void)struct reftable_writer *w =reftable_new_writer (&strbuf_add_void, &noop_flush, &buf, &opts);struct reftable_ref_record ref = { - .refname ="" , + .refname = (char *)"" , .update_index =1 , .value_type =REFTABLE_REF_DELETION , };
@@ -752,18 +752,18 @@ static void test_write_key_order(void)reftable_new_writer (&strbuf_add_void, &noop_flush, &buf, &opts);struct reftable_ref_record refs[2 ] = { { - .refname ="b" , + .refname = (char *)"b" , .update_index =1 , .value_type =REFTABLE_REF_SYMREF , .value = { - .symref ="target" , + .symref = (char *)"target" , }, }, { - .refname ="a" , + .refname = (char *)"a" , .update_index =1 , .value_type =REFTABLE_REF_SYMREF , .value = { - .symref ="target" , + .symref = (char *)"target" , }, } };
reftable/stack_test.c +24 -24
152 lines not on this page · raw message
Signature · 1 line
2.45.1.410.g58bac47f8e.dirty
PATCH v3 5/27 refspec: remove global tag refspec structure
In reply to Patrick SteinhardtWe have a global tag refspec structure that is used by both git-clone(1) and git-fetch(1). Initialization fo the structure will break once we enable -Wwrite-strings, even though the breakage is harmless. While we could just add casts, the structure isn't really required in the first place as we can simply initialize the structures at the respective callsites.
Refactor the code accordingly.
--- builtin/clone.c | 8 ++++++-- builtin/fetch.c | 11 ++++++++--- refspec.c | 13 ------------- refspec.h | 1 - 4 files changed, 14 insertions(+), 19 deletions(-)
builtin/clone.c +6 -2
@@ -523,6 +523,9 @@ static struct ref *wanted_peer_refs(const struct ref *refs,struct ref *head =copy_ref (find_ref_by_name (refs,"HEAD" ));struct ref *local_refs = head;struct ref **tail = head ? &head->next : &local_refs; +struct refspec_item tag_refspec; + +refspec_item_init (&tag_refspec,TAG_REFSPEC ,0 );if (option_single_branch) {struct ref *remote_head =NULL ;
@@ -545,7 +548,7 @@ static struct ref *wanted_peer_refs(const struct ref *refs, &tail, 0);/* if --branch=tag, pull the requested tag explicitly */ -get_fetch_map (remote_head, tag_refspec, &tail,0 ); +get_fetch_map (remote_head, &tag_refspec, &tail,0 ); }free_refs (remote_head); }else {
@@ -555,8 +558,9 @@ static struct ref *wanted_peer_refs(const struct ref *refs, }if (!option_mirror && !option_single_branch && !option_no_tags) -get_fetch_map (refs, tag_refspec, &tail,0 ); +get_fetch_map (refs, &tag_refspec, &tail,0 ); +refspec_item_clear (&tag_refspec);return local_refs; }
builtin/fetch.c +8 -3
@@ -582,11 +582,16 @@ static struct ref *get_ref_map(struct remote *remote, } } -if (tags ==TAGS_SET ) +if (tags ==TAGS_SET ) { +struct refspec_item tag_refspec; +/* also fetch all tags */ -get_fetch_map (remote_refs, tag_refspec, &tail,0 ); -else if (tags ==TAGS_DEFAULT && *autotags) +refspec_item_init (&tag_refspec,TAG_REFSPEC ,0 ); +get_fetch_map (remote_refs, &tag_refspec, &tail,0 ); +refspec_item_clear (&tag_refspec); + }else if (tags ==TAGS_DEFAULT && *autotags) {find_non_local_tags (remote_refs,NULL , &ref_map, &tail); + }/* Now append any refs to be updated opportunistically: */ *tail = orefs;
refspec.c +0 -13
@@ -7,19 +7,6 @@#include "refspec.h" #include "strbuf.h" -static struct refspec_item s_tag_refspec = { - .force =0 , - .pattern =1 , - .matching =0 , - .exact_sha1 =0 , - .negative =0 , - .src ="refs/tags/*" , - .dst ="refs/tags/*" , -}; - -/* See TAG_REFSPEC for the string version */ -const struct refspec_item *tag_refspec = &s_tag_refspec; -/* * Parses the provided refspec 'refspec' and populates the refspec_item 'item'. * Returns 1 if successful and 0 if the refspec is invalid.
refspec.h +0 -1
@@ -2,7 +2,6 @@#define REFSPEC_H #define TAG_REFSPEC "refs/tags/*:refs/tags/*" -extern const struct refspec_item *tag_refspec; /** * A struct refspec_item holds the parsed interpretation of a refspec. If it
Signature · 1 line
2.45.1.410.g58bac47f8e.dirty
PATCH v3 6/27 builtin/remote: cast away constness in `get_head_names()`
In reply to Patrick SteinhardtIn get_head_names(), we assign the "refs/heads/*" string constant to struct refspec_item::{src,dst}, which are both non-constant pointers. Ideally, we'd refactor the code such that both of these fields were constant. But struct refspec_item is used for two different usecases with conflicting requirements:
- To query for a source or destination based on the given refspec. The caller either sets src or dst as the branch that we want to search for, and the respective other field gets populated. The fields should be constant when being used as a query parameter, which is owned by the caller, and non-constant when being used as an out parameter, which is owned by the refspec item. This is is contradictory in itself already.
- To store refspec items with their respective source and destination branches, in which case both fields should be owned by the struct.
Ideally, we'd split up this interface to clearly separate between querying and storing, which would enable us to clarify lifetimes of the strings. This would be a much bigger undertaking though.
Instead, accept the status quo for now and cast away the constness of the source and destination patterns. We know that those are not being written to or freed, so while this is ugly it certainly is fine for now.
--- builtin/remote.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
builtin/remote.c +6 -6
@@ -493,12 +493,13 @@ static int get_head_names(const struct ref *remote_refs, struct ref_states *stat {struct ref *ref, *matches;struct ref *fetch_map =NULL , **fetch_map_tail = &fetch_map; -struct refspec_item refspec; +struct refspec_item refspec = { + .force =0 , + .pattern =1 , + .src = (char *)"refs/heads/*" , + .dst = (char *)"refs/heads/*" , + }; -memset (&refspec,0 ,sizeof (refspec)); - refspec.force =0 ; - refspec.pattern =1 ; - refspec.src = refspec.dst ="refs/heads/*" ;get_fetch_map (remote_refs, &refspec, &fetch_map_tail,0 ); matches =guess_remote_head (find_ref_by_name (remote_refs,"HEAD" ), fetch_map,1 );
@@ -507,7 +508,6 @@ static int get_head_names(const struct ref *remote_refs, struct ref_states *statfree_refs (fetch_map);free_refs (matches); -return 0 ; }
Signature · 1 line
2.45.1.410.g58bac47f8e.dirty
PATCH v3 7/27 diff: cast string constant in `fill_textconv()`
In reply to Patrick SteinhardtThe fill_textconv() function is responsible for converting an input file with a textconv driver, which is then passed to the caller. Weirdly though, the function also handles the case where there is no textconv driver at all. In that case, it will return either the contents of the populated filespec, or an empty string if the filespec is invalid.
These two cases have differing memory ownership semantics. When there is a textconv driver, then the result is an allocated string. Otherwise, the result is either a string constant or owned by the filespec struct. All callers are in fact aware of this weirdness and only end up freeing the output buffer when they had a textconv driver.
Ideally, we'd split up this interface to only perform the conversion via the textconv driver, and BUG in case the caller didn't provide one. This would make memory ownership semantics much more straight forward. For now though, let's simply cast the empty string constant to char * to avoid a warning with -Wwrite-strings. This is equivalent to the same cast that we already have in fill_mmfile().
--- diff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff.c +1 -1
@@ -7235,7 +7235,7 @@ size_t fill_textconv(struct repository *r,if (!driver) {if (!DIFF_FILE_VALID (df)) { - *outbuf ="" ; + *outbuf = (char *)"" ;return 0 ; }if (diff_populate_filespec (r, df,NULL ))
Signature · 1 line
2.45.1.410.g58bac47f8e.dirty
PATCH v3 8/27 line-log: stop assigning string constant to file parent buffer
In reply to Patrick SteinhardtStop assigning a string constant to the file parent buffer and instead assign an allocated string. While the code is fine in practice, it will break once we compile with -Wwrite-strings.
--- line-log.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
line-log.c +3 -1
@@ -1032,6 +1032,7 @@ static int process_diff_filepair(struct rev_info *rev,struct range_set tmp;struct diff_ranges diff;mmfile_t file_parent, file_target; +char *parent_data_to_free =NULL ;assert (pair->two->path);while (rg) {
@@ -1056,7 +1057,7 @@ static int process_diff_filepair(struct rev_info *rev, file_parent.ptr = pair->one->data; file_parent.size = pair->one->size; }else { - file_parent.ptr ="" ; + file_parent.ptr = parent_data_to_free =xstrdup ("" ); file_parent.size =0 ; }
@@ -1075,6 +1076,7 @@ static int process_diff_filepair(struct rev_info *rev,diff_ranges_release (&diff); +free (parent_data_to_free);return ((*diff_out)->parent.nr >0 ); }
Signature · 1 line
2.45.1.410.g58bac47f8e.dirty
PATCH v3 9/27 line-log: always allocate the output prefix
In reply to Patrick SteinhardtThe returned string by output_prefix() is sometimes a string constant and sometimes an allocated string. This has been fine until now because we always leak the allocated strings, and thus we never tried to free the string constant.
Fix the code to always return an allocated string and free the returned value at all callsites.
--- line-log.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
line-log.c +11 -7
@@ -899,14 +899,12 @@ static void print_line(const char *prefix, char first,static char *output_prefix (struct diff_options *opt) { -char *prefix ="" ; -if (opt->output_prefix) {struct strbuf *sb = opt->output_prefix (opt, opt->output_prefix_data); - prefix = sb->buf; +return sb->buf; + }else { +return xstrdup ("" ); } - -return prefix; }static void dump_diff_hacky_one (struct rev_info *rev,struct line_log_data *range)
@@ -927,7 +925,7 @@ static void dump_diff_hacky_one(struct rev_info *rev, struct line_log_data *rangconst char *c_context =diff_get_color (opt->use_color,DIFF_CONTEXT );if (!pair || !diff) -return ; + goto out;if (pair->one->oid_valid)fill_line_ends (rev->diffopt.repo, pair->one, &p_lines, &p_ends);
@@ -1002,8 +1000,10 @@ static void dump_diff_hacky_one(struct rev_info *rev, struct line_log_data *rang c_context, c_reset, opt->file); } +out:free (p_ends);free (t_ends); +free (prefix); }/*
@@ -1012,7 +1012,11 @@ static void dump_diff_hacky_one(struct rev_info *rev, struct line_log_data *rang*/ static void dump_diff_hacky (struct rev_info *rev,struct line_log_data *range) { -fprintf (rev->diffopt.file,"%s\n" ,output_prefix (&rev->diffopt)); +char *prefix =output_prefix (&rev->diffopt); + +fprintf (rev->diffopt.file,"%s\n" , prefix); +free (prefix); +while (range) {dump_diff_hacky_one (rev, range); range = range->next;
Signature · 1 line
2.45.1.410.g58bac47f8e.dirty
PATCH v3 10/27 entry: refactor how we remove items for delayed checkouts
In reply to Patrick SteinhardtWhen finalizing a delayed checkout, we sort out several strings from the passed-in string list by first assigning the empty string to those filters and then calling string_list_remove_empty_items(). Assigning the empty string will cause compiler warnings though as the string is a char * once we enable -Wwrite-strings.
Refactor the code to use a NULL pointer with filter_string_list() instead to avoid this warning.
--- entry.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
entry.c +10 -4
@@ -167,6 +167,11 @@ static int remove_available_paths(struct string_list_item *item, void *cb_data)return !available; } +static int string_is_not_null(struct string_list_item *item, void *data UNUSED) +{ +return !!item->string; +} +int finish_delayed_checkout (struct checkout *state,int show_progress) {int errs =0 ;
@@ -189,7 +194,7 @@ int finish_delayed_checkout(struct checkout *state, int show_progress)if (!async_query_available_blobs (filter->string, &available_paths)) {/* Filter reported an error */ errs =1 ; - filter->string ="" ; + filter->string =NULL ;continue ; }if (available_paths.nr <=0 ) {
@@ -199,7 +204,7 @@ int finish_delayed_checkout(struct checkout *state, int show_progress)* filter from the list (see * "string_list_remove_empty_items" call below). */ - filter->string ="" ; + filter->string =NULL ;continue ; }
@@ -225,7 +230,7 @@ int finish_delayed_checkout(struct checkout *state, int show_progress)* Do not ask the filter for available blobs, * again, as the filter is likely buggy. */ - filter->string ="" ; + filter->string =NULL ;continue ; } ce = index_file_exists(state->istate, path->string,
@@ -239,7 +244,8 @@ int finish_delayed_checkout(struct checkout *state, int show_progress) errs =1 ; } } -string_list_remove_empty_items (&dco->filters,0 ); + +filter_string_list (&dco->filters,0 , string_is_not_null,NULL ); }stop_progress (&progress);string_list_clear (&dco->filters,0 );
Signature · 1 line
2.45.1.410.g58bac47f8e.dirty
PATCH v3 11/27 ident: add casts for fallback name and GECOS
In reply to Patrick SteinhardtIn xgetpwuid_self(), we return a fallback identity when it was not possible to look up the current identity. This fallback identity needs to be internal and must never be written to by the calles as specified by getpwuid(3P). As both the pw_name and pw_gecos fields are marked as non-constant though, it will cause a warning to assign constant strings to them once compiling with -Wwrite-strings.
Add explicit casts to avoid the warning.
--- ident.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
ident.c +2 -2
@@ -46,9 +46,9 @@ static struct passwd *xgetpwuid_self(int *is_bogus) pw =getpwuid (getuid ());if (!pw) {static struct passwd fallback; - fallback.pw_name ="unknown" ; + fallback.pw_name = (char *)"unknown" ;#ifndef NO_GECOS_IN_PWENT - fallback.pw_gecos ="Unknown" ; + fallback.pw_gecos = (char *)"Unknown" ;#endif pw = &fallback;if (is_bogus)
Signature · 1 line
2.45.1.410.g58bac47f8e.dirty
PATCH v3 12/27 object-file: mark cached object buffers as const
In reply to Patrick SteinhardtThe buffers of cached objects are never modified, but are still stored as a non-constant pointer. This will cause a compiler warning once we enable the -Wwrite-strings compiler warning as we assign an empty constant string when initializing the static empty_tree cached object.
Convert the field to be constant. This requires us to shuffle around the code a bit because we memcpy(3P) into the allocated buffer in pretend_object_file(). This is easily fixed though by allocating the buffer into a temporary variable first.
--- object-file.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
object-file.c +6 -3
@@ -277,7 +277,7 @@ int hash_algo_by_length(int len)static struct cached_object {struct object_id oid;enum object_type type; -void *buf; +const void *buf;unsigned long size; } *cached_objects;static int cached_object_nr, cached_object_alloc;
@@ -1778,6 +1778,10 @@ int pretend_object_file(void *buf, unsigned long len, enum object_type type, struct object_id *oid) {struct cached_object *co; +char *co_buf; + + co_buf =xmalloc (len); +memcpy (co_buf, buf, len);hash_object_file (the_hash_algo, buf, len, type, oid); if (repo_has_object_file_with_flags(the_repository, oid, OBJECT_INFO_QUICK | OBJECT_INFO_SKIP_FETCH_OBJECT) ||
@@ -1787,8 +1791,7 @@ int pretend_object_file(void *buf, unsigned long len, enum object_type type, co = &cached_objects[cached_object_nr++]; co->size = len; co->type = type; - co->buf =xmalloc (len); -memcpy (co->buf, buf, len); + co->buf = co_buf;oidcpy (&co->oid, oid);return 0 ; }
Signature · 1 line
2.45.1.410.g58bac47f8e.dirty
PATCH v3 13/27 object-file: make `buf` parameter of `index_mem()` a constant
In reply to Patrick SteinhardtThe buf parameter of index_mem() is a non-constant string. This will break once we enable -Wwrite-strings because we also pass constants from at least one callsite.
Adapt the parameter to be a constant. As we cannot free the buffer without casting now, this also requires us to move the lifetime of the nested buffer around.
--- object-file.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
object-file.c +7 -7
@@ -2485,12 +2485,13 @@ static int hash_format_check_report(struct fsck_options *opts UNUSED, }static int index_mem (struct index_state *istate, -struct object_id *oid,void *buf,size_t size, +struct object_id *oid, +const void *buf,size_t size,enum object_type type,const char *path,unsigned flags) { +struct strbuf nbuf =STRBUF_INIT ;int ret =0 ; -int re_allocated =0 ;int write_object = flags &HASH_WRITE_OBJECT ;if (!type)
@@ -2500,11 +2501,10 @@ static int index_mem(struct index_state *istate,* Convert blobs to git internal format */ if ((type ==OBJ_BLOB ) && path) { -struct strbuf nbuf =STRBUF_INIT ;if (convert_to_git (istate, path, buf, size, &nbuf,get_conv_flags (flags))) { - buf =strbuf_detach (&nbuf, &size); - re_allocated =1 ; + buf = nbuf.buf; + size = nbuf.len; } }if (flags &HASH_FORMAT_CHECK ) {
@@ -2521,8 +2521,8 @@ static int index_mem(struct index_state *istate, ret =write_object_file (buf, size, type, oid); elsehash_object_file (the_hash_algo ,buf ,size ,type ,oid ); -if (re_allocated) -free (buf); + +strbuf_release (&nbuf);return ret; }
Signature · 1 line
2.45.1.410.g58bac47f8e.dirty
PATCH v3 14/27 pretty: add casts for decoration option pointers
In reply to Patrick SteinhardtThe struct decoration_options have a prefix and suffix field which are both non-constant, but we assign a constant pointer to them. This is safe to do because we pass them to format_decorations(), which never modifies these pointers, and then immediately discard the structure. Add explicit casts to avoid compilation warnings with -Wwrite-strings.
--- pretty.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
pretty.c +2 -2
@@ -1584,8 +1584,8 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */case 'D' : {const struct decoration_options opts = { - .prefix ="" , - .suffix ="" + .prefix = (char *)"" , + .suffix = (char *)"" , };format_decorations (sb, commit, c->auto_color, &opts);
Signature · 1 line
2.45.1.410.g58bac47f8e.dirty
PATCH v3 15/27 compat/win32: fix const-correctness with string constants
In reply to Patrick SteinhardtAdjust various places in our Win32 compatibility layer where we are not assigning string constants to const char * variables.
--- compat/basename.c | 18 ++++++++++++++++-- compat/mingw.c | 28 ++++++++++++++++------------ compat/winansi.c | 2 +- 3 files changed, 33 insertions(+), 15 deletions(-)
compat/basename.c +16 -2
@@ -1,6 +1,8 @@#include "../git-compat-util.h" #include "../strbuf.h" +static char current_directory[] ="." ; +/* Adapted from libiberty's basename.c. */ char *gitbasename (char *path) {
@@ -10,7 +12,13 @@ char *gitbasename (char *path)skip_dos_drive_prefix (&path);if (!path || !*path) -return "." ; +/* +* basename(3P) is mis-specified because it returns a +* non-constant pointer even though it is specified to return a +* pointer to internal memory at times. The cast is a result of +* that. +*/ +return (char *)"" ;for (base = path; *path; path++) {if (!is_dir_sep (*path))
@@ -34,7 +42,13 @@ char *gitdirname(char *path)int dos_drive_prefix;if (!p) -return "." ; +/* +* dirname(3P) is mis-specified because it returns a +* non-constant pointer even though it is specified to return a +* pointer to internal memory at times. The cast is a result of +* that. +*/ +return (char *)"" ;if ((dos_drive_prefix =skip_dos_drive_prefix (&p)) && !*p) goto dot;
compat/mingw.c +16 -12
@@ -2279,7 +2279,11 @@ struct passwd *getpwuid(int uid) p->pw_name = user_name; p->pw_gecos =get_extended_user_info (NameDisplay);if (!p->pw_gecos) - p->pw_gecos ="unknown" ; +/* +* Data returned by getpwuid(3P) is treated as internal and +* must never be written to or freed. +*/ + p->pw_gecos = (char *)"unknown" ; p->pw_dir =NULL ; initialized =1 ;
@@ -2800,16 +2804,16 @@ int is_path_owned_by_current_sid(const char *path, struct strbuf *report)strbuf_addf (report,"'%s' is on a file system that does " "not record ownership\n" , path); }else if (report) { -LPSTR str1, str2, str3, str4, to_free1 =NULL , - to_free3 =NULL , to_local_free2 =NULL , - to_local_free4 =NULL ; +PCSTR str1, str2, str3, str4; +LPSTR to_free1 =NULL , to_free3 =NULL , + to_local_free2 =NULL , to_local_free4 =NULL ; -if (user_sid_to_user_name (sid, &str1)) - to_free1 = str1; +if (user_sid_to_user_name (sid, &to_free1)) + str1 = to_free1;else str1 ="(inconvertible)" ; -if (ConvertSidToStringSidA (sid, &str2)) - to_local_free2 = str2; +if (ConvertSidToStringSidA (sid, &to_local_free2)) + str2 = to_local_free2;else str2 ="(inconvertible)" ;
@@ -2822,13 +2826,13 @@ int is_path_owned_by_current_sid(const char *path, struct strbuf *report) str4 ="(invalid)" ; }else {if (user_sid_to_user_name (current_user_sid, - &str3)) - to_free3 = str3; + &to_free3)) + str3 = to_free3;else str3 ="(inconvertible)" ;if (ConvertSidToStringSidA (current_user_sid, - &str4)) - to_local_free4 = str4; + &to_local_free4)) + str4 = to_local_free4;else str4 ="(inconvertible)" ; }
compat/winansi.c +1 -1
@@ -139,7 +139,7 @@ static void write_console(unsigned char *str, size_t len)/* convert utf-8 to utf-16 */ int wlen =xutftowcsn (wbuf, (char *) str,ARRAY_SIZE (wbuf), len);if (wlen <0 ) { -wchar_t *err =L"[invalid]" ; +const wchar_t *err =L"[invalid]" ;WriteConsoleW (console, err,wcslen (err), &dummy,NULL );return ; }
Signature · 1 line
2.45.1.410.g58bac47f8e.dirty
PATCH v3 16/27 http: do not assign string constant to non-const field
In reply to Patrick SteinhardtIn write_accept_language(), we put all acceptable languages into an array. While all entries in that array are allocated strings, the final entry in that array is a string constant. This is fine because we explicitly skip over the last entry when freeing the array, but will cause warnings once we enable -Wwrite-strings.
Adapt the code to also allocate the final entry.
--- http.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
http.c +2 -3
@@ -1974,7 +1974,7 @@ static void write_accept_language(struct strbuf *buf)/* add '*' */ REALLOC_ARRAY (language_tags, num_langs +1 ); - language_tags[num_langs++] ="*" ;/* it's OK; this won't be freed */ + language_tags[num_langs++] =xstrdup ("*" );/* compute decimal_places */ for (max_q = 1, decimal_places = 0;
@@ -2004,8 +2004,7 @@ static void write_accept_language(struct strbuf *buf) } } -/* free language tags -- last one is a static '*' */ -for (i =0 ; i < num_langs -1 ; i++) +for (i =0 ; i < num_langs; i++)free (language_tags[i]);free (language_tags); }
Signature · 1 line
2.45.1.410.g58bac47f8e.dirty
PATCH v3 17/27 parse-options: cast long name for OPTION_ALIAS
In reply to Patrick SteinhardtWe assign the long name for OPTION_ALIAS options to a non-constant value field. We know that the variable will never be written to, but this will cause warnings once we enable -Wwrite-strings.
Cast away the constness to be prepared for this change.
--- parse-options.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
parse-options.h +1 -1
@@ -355,7 +355,7 @@ struct option { .type = OPTION_ALIAS, \ .short_name = (s), \ .long_name = (l), \ - .value = (source_long_name), \ + .value = (char *)(source_long_name), \ }#define OPT_SUBCOMMAND_F (l, v, fn, f) { \
Signature · 1 line
2.45.1.410.g58bac47f8e.dirty
PATCH v3 18/27 send-pack: always allocate receive status
In reply to Patrick SteinhardtIn receive_status(), we record the reason why ref updates have been rejected by the remote via the remote_status. But while we allocate the assigned string when a reason was given, we assign a string constant when no reason was given.
This has been working fine so far due to two reasons:
- We don't ever free the refs in git-send-pack(1)'
- Remotes always give a reason, at least as implemented by Git proper.
Adapt the code to always allocate the receive status string and free the refs.
--- builtin/send-pack.c | 2 ++ send-pack.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)
builtin/send-pack.c +2 -0
@@ -336,5 +336,7 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)/* stable plumbing output; do not modify or localize */ fprintf (stderr,"Everything up-to-date\n" ); +free_refs (remote_refs); +free_refs (local_refs);return ret; }
send-pack.c +1 -1
@@ -259,7 +259,7 @@ static int receive_status(struct packet_reader *reader, struct ref *refs)if (p) hint->remote_status =xstrdup (p);else - hint->remote_status ="failed" ; + hint->remote_status =xstrdup ("failed" ); }else { hint->status =REF_STATUS_OK ; hint->remote_status =xstrdup_or_null (p);
Signature · 1 line
2.45.1.410.g58bac47f8e.dirty
PATCH v3 19/27 remote-curl: avoid assigning string constant to non-const variable
In reply to Patrick SteinhardtWhen processing remote options, we split the option line into two by searching for a space. If there is one, we replace the space with '\0', otherwise we implicitly assume that the value is "true" and thus assign a string constant.
As the return value of strchr(3P) weirdly enough is a char * even though it gets a const char * as input, the assigned-to variable also is a non-constant. This is fine though because the argument is in fact an allocated string, and thus we are allowed to modify it. But this will break once we enable -Wwrite-strings.
Refactor the code stop splitting the fields with '\0' altogether. Instead, we can pass the length of the option name to set_option() and then use strncmp(3P) instead of strcmp(3P).
--- remote-curl.c | 53 ++++++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 26 deletions(-)
remote-curl.c +27 -26
@@ -58,9 +58,9 @@ struct options {static struct options options;static struct string_list cas_options =STRING_LIST_INIT_DUP ; -static int set_option (const char *name,const char *value) +static int set_option (const char *name,size_t namelen,const char *value) { -if (!strcmp (name,"verbosity" )) { +if (!strncmp (name,"verbosity" , namelen)) {char *end;int v =strtol (value, &end,10 );if (value == end || *end)
@@ -68,7 +68,7 @@ static int set_option(const char *name, const char *value) options.verbosity = v;return 0 ; } -else if (!strcmp (name,"progress" )) { +else if (!strncmp (name,"progress" , namelen)) {if (!strcmp (value,"true" )) options.progress =1 ;else if (!strcmp (value,"false" ))
@@ -77,7 +77,7 @@ static int set_option(const char *name, const char *value)return -1 ;return 0 ; } -else if (!strcmp (name,"depth" )) { +else if (!strncmp (name,"depth" , namelen)) {char *end;unsigned long v =strtoul (value, &end,10 );if (value == end || *end)
@@ -85,15 +85,15 @@ static int set_option(const char *name, const char *value) options.depth = v;return 0 ; } -else if (!strcmp (name,"deepen-since" )) { +else if (!strncmp (name,"deepen-since" , namelen)) { options.deepen_since =xstrdup (value);return 0 ; } -else if (!strcmp (name,"deepen-not" )) { +else if (!strncmp (name,"deepen-not" , namelen)) {string_list_append (&options.deepen_not, value);return 0 ; } -else if (!strcmp (name,"deepen-relative" )) { +else if (!strncmp (name,"deepen-relative" , namelen)) {if (!strcmp (value,"true" )) options.deepen_relative =1 ;else if (!strcmp (value,"false" ))
@@ -102,7 +102,7 @@ static int set_option(const char *name, const char *value)return -1 ;return 0 ; } -else if (!strcmp (name,"followtags" )) { +else if (!strncmp (name,"followtags" , namelen)) {if (!strcmp (value,"true" )) options.followtags =1 ;else if (!strcmp (value,"false" ))
@@ -111,7 +111,7 @@ static int set_option(const char *name, const char *value)return -1 ;return 0 ; } -else if (!strcmp (name,"dry-run" )) { +else if (!strncmp (name,"dry-run" , namelen)) {if (!strcmp (value,"true" )) options.dry_run =1 ;else if (!strcmp (value,"false" ))
@@ -120,7 +120,7 @@ static int set_option(const char *name, const char *value)return -1 ;return 0 ; } -else if (!strcmp (name,"check-connectivity" )) { +else if (!strncmp (name,"check-connectivity" , namelen)) {if (!strcmp (value,"true" )) options.check_self_contained_and_connected =1 ;else if (!strcmp (value,"false" ))
@@ -129,7 +129,7 @@ static int set_option(const char *name, const char *value)return -1 ;return 0 ; } -else if (!strcmp (name,"cas" )) { +else if (!strncmp (name,"cas" , namelen)) {struct strbuf val =STRBUF_INIT ;strbuf_addstr (&val,"--force-with-lease=" );if (*value !='"' )
@@ -139,7 +139,7 @@ static int set_option(const char *name, const char *value)string_list_append (&cas_options, val.buf);strbuf_release (&val);return 0 ; - }else if (!strcmp (name,TRANS_OPT_FORCE_IF_INCLUDES )) { + }else if (!strncmp (name,TRANS_OPT_FORCE_IF_INCLUDES , namelen)) {if (!strcmp (value,"true" )) options.force_if_includes =1 ;else if (!strcmp (value,"false" ))
@@ -147,7 +147,7 @@ static int set_option(const char *name, const char *value)else return -1 ;return 0 ; - }else if (!strcmp (name,"cloning" )) { + }else if (!strncmp (name,"cloning" , namelen)) {if (!strcmp (value,"true" )) options.cloning =1 ;else if (!strcmp (value,"false" ))
@@ -155,7 +155,7 @@ static int set_option(const char *name, const char *value)else return -1 ;return 0 ; - }else if (!strcmp (name,"update-shallow" )) { + }else if (!strncmp (name,"update-shallow" , namelen)) {if (!strcmp (value,"true" )) options.update_shallow =1 ;else if (!strcmp (value,"false" ))
@@ -163,7 +163,7 @@ static int set_option(const char *name, const char *value)else return -1 ;return 0 ; - }else if (!strcmp (name,"pushcert" )) { + }else if (!strncmp (name,"pushcert" , namelen)) {if (!strcmp (value,"true" )) options.push_cert =SEND_PACK_PUSH_CERT_ALWAYS ;else if (!strcmp (value,"false" ))
@@ -173,7 +173,7 @@ static int set_option(const char *name, const char *value)else return -1 ;return 0 ; - }else if (!strcmp (name,"atomic" )) { + }else if (!strncmp (name,"atomic" , namelen)) {if (!strcmp (value,"true" )) options.atomic =1 ;else if (!strcmp (value,"false" ))
@@ -181,7 +181,7 @@ static int set_option(const char *name, const char *value)else return -1 ;return 0 ; - }else if (!strcmp (name,"push-option" )) { + }else if (!strncmp (name,"push-option" , namelen)) {if (*value !='"' )string_list_append (&options.push_options, value);else {
@@ -192,7 +192,7 @@ static int set_option(const char *name, const char *value) strbuf_detach(&unquoted, NULL)); }return 0 ; - }else if (!strcmp (name,"family" )) { + }else if (!strncmp (name,"family" , namelen)) {if (!strcmp (value,"ipv4" )) git_curl_ipresolve =CURL_IPRESOLVE_V4 ;else if (!strcmp (value,"ipv6" ))
@@ -202,16 +202,16 @@ static int set_option(const char *name, const char *value)else return -1 ;return 0 ; - }else if (!strcmp (name,"from-promisor" )) { + }else if (!strncmp (name,"from-promisor" , namelen)) { options.from_promisor =1 ;return 0 ; - }else if (!strcmp (name,"refetch" )) { + }else if (!strncmp (name,"refetch" , namelen)) { options.refetch =1 ;return 0 ; - }else if (!strcmp (name,"filter" )) { + }else if (!strncmp (name,"filter" , namelen)) { options.filter =xstrdup (value);return 0 ; - }else if (!strcmp (name,"object-format" )) { + }else if (!strncmp (name,"object-format" , namelen)) { options.object_format =1 ;if (strcmp (value,"true" ))die (_ ("unknown value for object-format: %s" ), value);
@@ -1588,15 +1588,16 @@ int cmd_main(int argc, const char **argv)parse_push (&buf); }else if (skip_prefix (buf.buf,"option " , &arg)) { -char *value =strchr (arg,' ' ); +const char *value =strchrnul (arg,' ' ); +size_t arglen = value - arg;int result; -if (value) - *value++ ='\0' ; +if (*value) + value++;/* skip over SP */ else value ="true" ; - result =set_option (arg, value); + result =set_option (arg, arglen, value);if (!result)printf ("ok\n" );else if (result <0 )
Signature · 1 line
2.45.1.410.g58bac47f8e.dirty
PATCH v3 20/27 revision: always store allocated strings in output encoding
In reply to Patrick SteinhardtThe git_log_output_encoding variable can be set via the --encoding= option. When doing so, we conditionally either assign it to the passed value, or if the value is "none" we assign it the empty string. Depending on which of the both code paths we pick though, the variable may end up being assigned either an allocated string or a string constant.
This is somewhat risky and may easily lead to bugs when a different code path may want to reassign a new value to it, freeing the previous value. We already to this when parsing the "i18n.logoutputencoding" config in git_default_i18n_config(). But because the config is typically parsed before we parse command line options this has been fine so far.
Regardless of that, safeguard the code such that the variable always contains an allocated string. While at it, also free the old value in case there was any to plug a potential memory leak.
--- revision.c | 3 ++- t/t3900-i18n-commit.sh | 1 + t/t3901-i18n-patch.sh | 1 + 3 files changed, 4 insertions(+), 1 deletion(-)
revision.c +2 -1
@@ -2650,10 +2650,11 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg }else if (!strcmp (arg,"--invert-grep" )) { revs->grep_filter.no_body_match =1 ; }else if ((argcount =parse_long_opt ("encoding" , argv, &optarg))) { +free (git_log_output_encoding);if (strcmp (optarg,"none" )) git_log_output_encoding =xstrdup (optarg);else - git_log_output_encoding ="" ; + git_log_output_encoding =xstrdup ("" );return argcount; }else if (!strcmp (arg,"--reverse" )) { revs->reverse ^=1 ;
t/t3900-i18n-commit.sh +1 -0
@@ -5,6 +5,7 @@ test_description='commit and log output encodings' +TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh compare_with () {
t/t3901-i18n-patch.sh +1 -0
@@ -8,6 +8,7 @@ test_description='i18n settings and format-patch | am pipe' GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME +TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh check_encoding () {
Signature · 1 line
2.45.1.410.g58bac47f8e.dirty
PATCH v3 21/27 mailmap: always store allocated strings in mailmap blob
In reply to Patrick SteinhardtSame as with the preceding commit, the git_mailmap_blob may sometimes contain an allocated string and sometimes it may contain a string constant. This is risky and can easily lead to bugs in case the variable is getting re-assigned, where the code may then try to free the previous value to avoid memory leaks.
Safeguard the code by always storing allocated strings in the variable.
--- mailmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mailmap.c +1 -1
@@ -216,7 +216,7 @@ int read_mailmap(struct string_list *map) map->cmp = namemap_cmp;if (!git_mailmap_blob &&is_bare_repository ()) - git_mailmap_blob ="HEAD:.mailmap" ; + git_mailmap_blob =xstrdup ("HEAD:.mailmap" );if (!startup_info->have_repository || !is_bare_repository ()) err |= read_mailmap_file(map, ".mailmap",
Signature · 1 line
2.45.1.410.g58bac47f8e.dirty
PATCH v3 22/27 imap-send: drop global `imap_server_conf` variable
In reply to Patrick SteinhardtIn "imap-send.c", we have a global sturct imap_server_conf variable that keeps track of the configuration of the IMAP server. This variable is being populated mostly via the Git configuration.
Refactor the code to allocate the structure on the stack instead of having it globally. This change allows us to track its lifetime more closely.
--- imap-send.c | 57 ++++++++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 27 deletions(-)
imap-send.c +30 -27
@@ -82,10 +82,6 @@ struct imap_server_conf {char *auth_method; }; -static struct imap_server_conf server = { - .ssl_verify =1 , -}; -struct imap_socket {int fd[2 ];SSL *ssl;
@@ -110,6 +106,7 @@ struct imap { };struct imap_store { +const struct imap_server_conf *cfg;/* currently open mailbox */ const char *name;/* foreign! maybe preset? */ int uidvalidity;
@@ -194,8 +191,8 @@ static void socket_perror(const char *func, struct imap_socket *sock, int ret)#ifdef NO_OPENSSL static int ssl_socket_connect(struct imap_socket *sock UNUSED, - int use_tls_only UNUSED, - int verify UNUSED) +const struct imap_server_conf *cfg, + int use_tls_only UNUSED) {fprintf (stderr,"SSL requested but SSL support not compiled in\n" );return -1 ;
@@ -250,7 +247,9 @@ static int verify_hostname(X509 *cert, const char *hostname) cname, hostname); } -static int ssl_socket_connect (struct imap_socket *sock,int use_tls_only,int verify) +static int ssl_socket_connect (struct imap_socket *sock, +const struct imap_server_conf *cfg, +int use_tls_only) {#if (OPENSSL_VERSION_NUMBER >=0x10000000L )const SSL_METHOD *meth;
@@ -279,7 +278,7 @@ static int ssl_socket_connect(struct imap_socket *sock, int use_tls_only, int veif (use_tls_only)SSL_CTX_set_options (ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3); -if (verify) +if (cfg->ssl_verify)SSL_CTX_set_verify (ctx,SSL_VERIFY_PEER ,NULL );if (!SSL_CTX_set_default_verify_paths (ctx)) {
@@ -306,9 +305,9 @@ static int ssl_socket_connect(struct imap_socket *sock, int use_tls_only, int ve* OpenSSL does not document this function, but the implementation * returns 1 on success, 0 on failure after calling SSLerr(). */ - ret =SSL_set_tlsext_host_name (sock->ssl, server.host); + ret =SSL_set_tlsext_host_name (sock->ssl, cfg->host);if (ret !=1 ) -warning ("SSL_set_tlsext_host_name(%s) failed." , server.host); +warning ("SSL_set_tlsext_host_name(%s) failed." , cfg->host);#endif ret =SSL_connect (sock->ssl);
@@ -317,12 +316,12 @@ static int ssl_socket_connect(struct imap_socket *sock, int use_tls_only, int vereturn -1 ; } -if (verify) { +if (cfg->ssl_verify) {/* make sure the hostname matches that of the certificate */ cert =SSL_get_peer_certificate (sock->ssl);if (!cert)return error ("unable to get peer certificate." ); -if (verify_hostname (cert, server.host) <0 ) +if (verify_hostname (cert, cfg->host) <0 )return -1 ; }
@@ -895,7 +894,7 @@ static int auth_cram_md5(struct imap_store *ctx, const char *prompt)int ret;char *response; - response =cram (prompt, server.user, server.pass); + response =cram (prompt, ctx->cfg->user, ctx->cfg->pass); ret =socket_write (&ctx->imap->buf.sock, response,strlen (response));if (ret !=strlen (response))
@@ -935,6 +934,7 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, const cCALLOC_ARRAY (ctx,1 ); + ctx->cfg = srvc; ctx->imap =CALLOC_ARRAY (imap,1 ); imap->buf.sock.fd[0 ] = imap->buf.sock.fd[1 ] =-1 ; imap->in_progress_append = &imap->in_progress;
@@ -1035,7 +1035,7 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, const c imap->buf.sock.fd[1 ] =dup (s);if (srvc->use_ssl && -ssl_socket_connect (&imap->buf.sock,0 , srvc->ssl_verify)) { +ssl_socket_connect (&imap->buf.sock, srvc,0 )) {close (s); goto bail; }
@@ -1068,8 +1068,7 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, const cif (!srvc->use_ssl &&CAP (STARTTLS )) {if (imap_exec (ctx,NULL ,"STARTTLS" ) !=RESP_OK ) goto bail; -if (ssl_socket_connect (&imap->buf.sock,1 , - srvc->ssl_verify)) +if (ssl_socket_connect (&imap->buf.sock, srvc,1 )) goto bail;/* capabilities may have changed, so get the new capabilities */ if (imap_exec (ctx,NULL ,"CAPABILITY" ) !=RESP_OK )
@@ -1299,23 +1298,24 @@ static int split_msg(struct strbuf *all_msgs, struct strbuf *msg, int *ofs)static int git_imap_config (const char *var,const char *val,const struct config_context *ctx,void *cb) { +struct imap_server_conf *cfg = cb;if (!strcmp ("imap.sslverify" , var)) - server.ssl_verify =git_config_bool (var, val); + cfg->ssl_verify =git_config_bool (var, val);else if (!strcmp ("imap.preformattedhtml" , var)) - server.use_html =git_config_bool (var, val); + cfg->use_html =git_config_bool (var, val);else if (!strcmp ("imap.folder" , var)) -return git_config_string (&server.folder, var, val); +return git_config_string (&cfg->folder, var, val);else if (!strcmp ("imap.user" , var)) -return git_config_string (&server.user, var, val); +return git_config_string (&cfg->user, var, val);else if (!strcmp ("imap.pass" , var)) -return git_config_string (&server.pass, var, val); +return git_config_string (&cfg->pass, var, val);else if (!strcmp ("imap.tunnel" , var)) -return git_config_string (&server.tunnel, var, val); +return git_config_string (&cfg->tunnel, var, val);else if (!strcmp ("imap.authmethod" , var)) -return git_config_string (&server.auth_method, var, val); +return git_config_string (&cfg->auth_method, var, val);else if (!strcmp ("imap.port" , var)) - server.port =git_config_int (var, val, ctx->kvi); + cfg->port =git_config_int (var, val, ctx->kvi);else if (!strcmp ("imap.host" , var)) {if (!val) {return config_error_nonbool (var);
@@ -1324,11 +1324,11 @@ static int git_imap_config(const char *var, const char *val, val +=5 ; else if (starts_with(val, "imaps:")) { val +=6 ; - server.use_ssl =1 ; + cfg->use_ssl =1 ; }if (starts_with (val,"//" )) val +=2 ; - server.host =xstrdup (val); + cfg->host =xstrdup (val); } }else return git_default_config (var, val, ctx, cb);
@@ -1497,12 +1497,15 @@ static int curl_append_msgs_to_imap(struct imap_server_conf *server,int cmd_main (int argc,const char **argv) { +struct imap_server_conf server = { + .ssl_verify =1 , + };struct strbuf all_msgs =STRBUF_INIT ;int total;int nongit_ok;setup_git_directory_gently (&nongit_ok); -git_config (git_imap_config,NULL ); +git_config (git_imap_config, &server); argc =parse_options (argc, (const char **)argv,"" , imap_send_options, imap_send_usage,0 );
Signature · 1 line
2.45.1.410.g58bac47f8e.dirty
PATCH v3 23/27 imap-send: fix leaking memory in `imap_server_conf`
In reply to Patrick SteinhardtWe never free any of the config strings that we populate into the struct imap_server_conf. Fix this by creating a common exit path where we can free resources.
While at it, drop the unused member imap_server_conf::name.
--- imap-send.c | 65 ++++++++++++++++++++++++++++++++++------------------- 1 file changed, 42 insertions(+), 23 deletions(-)
imap-send.c +42 -23
@@ -69,7 +69,6 @@ static void imap_warn(const char *, ...);static char *next_arg (char **);struct imap_server_conf { -const char *name;char *tunnel;char *host;int port;
@@ -1300,23 +1299,28 @@ static int git_imap_config(const char *var, const char *val, {struct imap_server_conf *cfg = cb; -if (!strcmp ("imap.sslverify" , var)) +if (!strcmp ("imap.sslverify" , var)) { cfg->ssl_verify =git_config_bool (var, val); -else if (!strcmp ("imap.preformattedhtml" , var)) + }else if (!strcmp ("imap.preformattedhtml" , var)) { cfg->use_html =git_config_bool (var, val); -else if (!strcmp ("imap.folder" , var)) + }else if (!strcmp ("imap.folder" , var)) { +FREE_AND_NULL (cfg->folder);return git_config_string (&cfg->folder, var, val); -else if (!strcmp ("imap.user" , var)) + }else if (!strcmp ("imap.user" , var)) { +FREE_AND_NULL (cfg->folder);return git_config_string (&cfg->user, var, val); -else if (!strcmp ("imap.pass" , var)) + }else if (!strcmp ("imap.pass" , var)) { +FREE_AND_NULL (cfg->folder);return git_config_string (&cfg->pass, var, val); -else if (!strcmp ("imap.tunnel" , var)) + }else if (!strcmp ("imap.tunnel" , var)) { +FREE_AND_NULL (cfg->folder);return git_config_string (&cfg->tunnel, var, val); -else if (!strcmp ("imap.authmethod" , var)) + }else if (!strcmp ("imap.authmethod" , var)) { +FREE_AND_NULL (cfg->folder);return git_config_string (&cfg->auth_method, var, val); -else if (!strcmp ("imap.port" , var)) + }else if (!strcmp ("imap.port" , var)) { cfg->port =git_config_int (var, val, ctx->kvi); -else if (!strcmp ("imap.host" , var)) { + }else if (!strcmp ("imap.host" , var)) {if (!val) {return config_error_nonbool (var); }else {
@@ -1330,8 +1334,9 @@ static int git_imap_config(const char *var, const char *val, val +=2 ; cfg->host =xstrdup (val); } - }else + }else {return git_default_config (var, val, ctx, cb); + }return 0 ; }
@@ -1503,6 +1508,7 @@ int cmd_main(int argc, const char **argv)struct strbuf all_msgs =STRBUF_INIT ;int total;int nongit_ok; +int ret;setup_git_directory_gently (&nongit_ok);git_config (git_imap_config, &server);
@@ -1529,42 +1535,55 @@ int cmd_main(int argc, const char **argv)if (!server.folder) {fprintf (stderr,"no imap store specified\n" ); -return 1 ; + ret =1 ; + goto out; }if (!server.host) {if (!server.tunnel) {fprintf (stderr,"no imap host specified\n" ); -return 1 ; + ret =1 ; + goto out; } - server.host ="tunnel" ; + server.host =xstrdup ("tunnel" ); }/* read the messages */ if (strbuf_read (&all_msgs,0 ,0 ) <0 ) {error_errno (_ ("could not read from stdin" )); -return 1 ; + ret =1 ; + goto out; }if (all_msgs.len ==0 ) {fprintf (stderr,"nothing to send\n" ); -return 1 ; + ret =1 ; + goto out; } total =count_messages (&all_msgs);if (!total) {fprintf (stderr,"no messages to send\n" ); -return 1 ; + ret =1 ; + goto out; }/* write it to the imap server */ if (server.tunnel) -return append_msgs_to_imap (&server, &all_msgs, total); - + ret =append_msgs_to_imap (&server, &all_msgs, total);#ifdef USE_CURL_FOR_IMAP_SEND -if (use_curl) -return curl_append_msgs_to_imap (&server, &all_msgs, total); + else if (use_curl) + ret =curl_append_msgs_to_imap (&server, &all_msgs, total);#endif - -return append_msgs_to_imap (&server, &all_msgs, total); + else + ret =append_msgs_to_imap (&server, &all_msgs, total); + +out: +free (server.tunnel); +free (server.host); +free (server.folder); +free (server.user); +free (server.pass); +free (server.auth_method); +return ret; }
Signature · 1 line
2.45.1.410.g58bac47f8e.dirty
PATCH v3 24/27 builtin/rebase: do not assign default backend to non-constant field
In reply to Patrick SteinhardtThe struct rebase_options::default_backend field is a non-constant string, but is being assigned a constant via REBASE_OPTIONS_INIT. Refactor the code to initialize and release options via two functions rebase_options_init() and rebase_options_release(). Like this, we can easily adapt the former funnction to use xstrdup() on the default value without hiding it away in a macro.
--- builtin/rebase.c | 67 ++++++++++++++++++++++++++++-------------------- 1 file changed, 39 insertions(+), 28 deletions(-)
builtin/rebase.c +39 -28
@@ -131,25 +131,40 @@ struct rebase_options {int config_update_refs; }; -#define REBASE_OPTIONS_INIT { \ - .type = REBASE_UNSPECIFIED, \ - .empty = EMPTY_UNSPECIFIED, \ - .keep_empty = 1, \ - .default_backend = "merge", \ - .flags = REBASE_NO_QUIET, \ - .git_am_opts = STRVEC_INIT, \ - .exec = STRING_LIST_INIT_NODUP, \ - .git_format_patch_opt = STRBUF_INIT, \ - .fork_point = -1, \ - .reapply_cherry_picks = -1, \ - .allow_empty_message = 1, \ - .autosquash = -1, \ - .rebase_merges = -1, \ - .config_rebase_merges = -1, \ - .update_refs = -1, \ - .config_update_refs = -1, \ - .strategy_opts = STRING_LIST_INIT_NODUP,\ - } +static void rebase_options_init (struct rebase_options *opts) +{ +memset (opts,0 ,sizeof (*opts)); + opts->type =REBASE_UNSPECIFIED ; + opts->empty =EMPTY_UNSPECIFIED ; + opts->default_backend =xstrdup ("merge" ); + opts->keep_empty =1 ; + opts->flags =REBASE_NO_QUIET ; +strvec_init (&opts->git_am_opts); +string_list_init_nodup (&opts->exec); +strbuf_init (&opts->git_format_patch_opt,0 ); + opts->fork_point =-1 ; + opts->reapply_cherry_picks =-1 ; + opts->allow_empty_message =1 ; + opts->autosquash =-1 ; + opts->rebase_merges =-1 ; + opts->config_rebase_merges =-1 ; + opts->update_refs =-1 ; + opts->config_update_refs =-1 ; +string_list_init_nodup (&opts->strategy_opts); +} + +static void rebase_options_release (struct rebase_options *opts) +{ +free (opts->default_backend); +free (opts->reflog_action); +free (opts->head_name); +strvec_clear (&opts->git_am_opts); +free (opts->gpg_sign_opt); +string_list_clear (&opts->exec,0 ); +free (opts->strategy); +string_list_clear (&opts->strategy_opts,0 ); +strbuf_release (&opts->git_format_patch_opt); +}static struct replay_opts get_replay_opts (const struct rebase_options *opts) {
@@ -796,6 +811,7 @@ static int rebase_config(const char *var, const char *value, }if (!strcmp (var,"rebase.backend" )) { +FREE_AND_NULL (opts->default_backend);return git_config_string (&opts->default_backend, var, value); }
@@ -1045,7 +1061,7 @@ static int check_exec_cmd(const char *cmd)int cmd_rebase (int argc,const char **argv,const char *prefix) { -struct rebase_options options =REBASE_OPTIONS_INIT ; +struct rebase_options options;const char *branch_name;int ret, flags, total_argc, in_progress =0 ;int keep_base =0 ;
@@ -1178,6 +1194,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) };int i; +rebase_options_init (&options); +if (argc ==2 && !strcmp (argv[1 ],"-h" ))usage_with_options (builtin_rebase_usage, builtin_rebase_options);
@@ -1833,14 +1851,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) cleanup:strbuf_release (&buf);strbuf_release (&revisions); -free (options.reflog_action); -free (options.head_name); -strvec_clear (&options.git_am_opts); -free (options.gpg_sign_opt); -string_list_clear (&options.exec,0 ); -free (options.strategy); -string_list_clear (&options.strategy_opts,0 ); -strbuf_release (&options.git_format_patch_opt); +rebase_options_release (&options);free (squash_onto_name);free (keep_base_onto_name);return !!ret;
Signature · 1 line
2.45.1.410.g58bac47f8e.dirty
PATCH v3 25/27 builtin/rebase: always store allocated string in `options.strategy`
In reply to Patrick SteinhardtThe struct rebase_options::strategy field is a char *, but we do end up assigning string constants to it in two cases:
- When being passed a --strategy= option via the command line.
- When being passed a strategy option via --strategy-option=, but not a strategy.
This will cause warnings once we enable -Wwrite-strings.
Ideally, we'd just convert the field to be a const char *. But we also assign to this field via the GIT_TEST_MERGE_ALGORITHM envvar, which we have to strdup(3P) into it.
Instead, refactor the code to make sure that we only ever assign allocated strings to this field.
--- builtin/rebase.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
builtin/rebase.c +7 -7
@@ -1063,6 +1063,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) {struct rebase_options options;const char *branch_name; +const char *strategy_opt =NULL ;int ret, flags, total_argc, in_progress =0 ;int keep_base =0 ;int ok_to_skip_pre_rebase =0 ;
@@ -1177,7 +1178,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) PARSE_OPT_OPTARG, parse_opt_rebase_merges),OPT_BOOL (0 ,"fork-point" , &options.fork_point,N_ ("use 'merge-base --fork-point' to refine upstream" )), -OPT_STRING ('s' ,"strategy" , &options.strategy, +OPT_STRING ('s' ,"strategy" , &strategy_opt,N_ ("strategy" ),N_ ("use the given merge strategy" )), OPT_STRING_LIST('X', "strategy-option", &options.strategy_opts, N_("option"),
@@ -1488,13 +1489,12 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) } } -if (options.strategy_opts.nr && !options.strategy) - options.strategy ="ort" ; - -if (options.strategy) { - options.strategy =xstrdup (options.strategy); +if (strategy_opt) + options.strategy =xstrdup (strategy_opt); +else if (options.strategy_opts.nr && !options.strategy) + options.strategy =xstrdup ("ort" ); +if (options.strategy)imply_merge (&options,"--strategy" ); - }if (options.root && !options.onto_name)imply_merge (&options,"--root without --onto" );
Signature · 1 line
2.45.1.410.g58bac47f8e.dirty
PATCH v3 26/27 builtin/merge: always store allocated strings in `pull_twohead`
In reply to Patrick SteinhardtThe pull_twohead configuration may sometimes contain an allocated string, and sometimes it may contain a string constant. Refactor this to instead always store an allocated string such that we can release its resources without risk.
While at it, manage the lifetime of other config strings, as well. Note that we explicitly don't free cleanup_arg here. This is because the variable may be assigned a string constant via command line options.
--- builtin/merge.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
builtin/merge.c +11 -7
@@ -611,17 +611,19 @@ static int git_merge_config(const char *k, const char *v,return 0 ; } -if (!strcmp (k,"merge.diffstat" ) || !strcmp (k,"merge.stat" )) +if (!strcmp (k,"merge.diffstat" ) || !strcmp (k,"merge.stat" )) { show_diffstat =git_config_bool (k, v); -else if (!strcmp (k,"merge.verifysignatures" )) + }else if (!strcmp (k,"merge.verifysignatures" )) { verify_signatures =git_config_bool (k, v); -else if (!strcmp (k,"pull.twohead" )) + }else if (!strcmp (k,"pull.twohead" )) { +FREE_AND_NULL (pull_twohead);return git_config_string (&pull_twohead, k, v); -else if (!strcmp (k,"pull.octopus" )) + }else if (!strcmp (k,"pull.octopus" )) { +FREE_AND_NULL (pull_octopus);return git_config_string (&pull_octopus, k, v); -else if (!strcmp (k,"commit.cleanup" )) + }else if (!strcmp (k,"commit.cleanup" )) {return git_config_string (&cleanup_arg, k, v); -else if (!strcmp (k,"merge.ff" )) { + }else if (!strcmp (k,"merge.ff" )) {int boolval =git_parse_maybe_bool (v);if (0 <= boolval) { fast_forward = boolval ?FF_ALLOW :FF_NO ;
@@ -1294,7 +1296,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)if (!pull_twohead) {char *default_strategy =getenv ("GIT_TEST_MERGE_ALGORITHM" );if (default_strategy && !strcmp (default_strategy,"ort" )) - pull_twohead ="ort" ; + pull_twohead =xstrdup ("ort" ); }init_diff_ui_defaults ();
@@ -1793,6 +1795,8 @@ int cmd_merge(int argc, const char **argv, const char *prefix) }strbuf_release (&buf);free (branch_to_free); +free (pull_twohead); +free (pull_octopus);discard_index (the_repository->index);return ret; }
Signature · 1 line
2.45.1.410.g58bac47f8e.dirty
PATCH v3 27/27 config.mak.dev: enable `-Wwrite-strings` warning
In reply to Patrick SteinhardtWriting to string constants is undefined behaviour and must be avoided in C. Even so, the compiler does not help us with this by default because those constants are not in fact marked as const. This makes it rather easy to accidentally assign a constant to a non-const variable or field and then later on try to either free it or write to it.
Enable -Wwrite-strings to catch such mistakes. With this warning enabled, the type of string constants is changed to const char[] and will thus cause compiler warnings when being assigned to non-const fields and variables.
--- config.mak.dev | 1 + 1 file changed, 1 insertion(+)
config.mak.dev +1 -0
@@ -37,6 +37,7 @@ DEVELOPER_CFLAGS += -Wpointer-arith DEVELOPER_CFLAGS += -Wstrict-prototypes DEVELOPER_CFLAGS += -Wunused DEVELOPER_CFLAGS += -Wvla +DEVELOPER_CFLAGS += -Wwrite-strings DEVELOPER_CFLAGS += -fno-common ifneq ($(filter clang4,$(COMPILER_FEATURES)),)
Signature · 1 line
2.45.1.410.g58bac47f8e.dirty
Re: [PATCH v3 15/27] compat/win32: fix const-correctness with string constants
In reply to Patrick SteinhardtQuoted 9 lines · Patrick Steinhardt
Adjust various places in our Win32 compatibility layer where we are not assigning string constants to
const char *variables.Signed-off-by Patrick Steinhardt <[email protected]>---
compat/basename.c +1
-0@@ -1,6 +1,8 @@ +static char current_directory[] ="." ;
compat/basename.c char *gitbasename (char *path) · line 19
Quoted 9 lines
compat/basename.c +7
-1@@ -10,7 +12,13 @@ char *gitbasename (char *path)if (!path || !*path) -return "." ; +/* +* basename(3P) is mis-specified because it returns a +* non-constant pointer even though it is specified to return a +* pointer to internal memory at times. The cast is a result of +* that. +*/ +return (char *)"" ;
The change from returning "." to returning "" is unexplained by the commit message. Did you mean to return the newly-introduced current_directory instead?
compat/basename.c char *gitdirname(char *path) · line 49
Quoted 10 lines
compat/basename.c +7
-1@@ -34,7 +42,13 @@ char *gitdirname(char *path)if (!p) -return "." ; +/* +* dirname(3P) is mis-specified because it returns a +* non-constant pointer even though it is specified to return a +* pointer to internal memory at times. The cast is a result of +* that. +*/ +return (char *)"" ;
Ditto.
Quoted 5 lines · Patrick Steinhardt
Changes compared to v2:
- I have split up the second patch into multiple patches. This was done so that we can have a deeper look at the respective sites that need adjustment.
We will see how well this helps reviewer.
Quoted 5 lines
- I dropped the local string arrays that I used in v2 and instead now use string constants with casts in some places where we expect that those should never be written to. This has the benefit that we would segfault in case that expectation is violated, instead of silently allowing a write to those local arrays.
Nice.
Quoted 3 lines
- I adapted multiple commit messages to not only mention freeing of string constants, but also that writing to string constants is illegal.
Nice again.
Quoted 3 lines
Due to the split-up patch the range-diff got quite messy and was barely readable anymore. I thus included an interdiff instead, which should be way easier to read.
Triply nice.
Thanks.
Re: [PATCH v3 03/27] refs/reftable: stop micro-optimizing refname allocations on copy
In reply to Patrick SteinhardtQuoted 2 lines · Patrick Steinhardt
When copying refs, we execute
write_copy_table()to write the new table. As the names arge given to use viaarg->newnameand
arge???
Quoted 11 lines
arg->oldname, respectively, we optimize away some allocations by assigning those fields to the reftable records we are about to write. This requires us to cast the input tochar *pointers as they are in fact constant strings. Later on, we then unset the refname for all of the records before callingreftable_log_record_release()on them.We also do this when assigning the "HEAD" constant, but here we do not cast because its type is
char[]by default. It's about to be turned intoconst char *though once we enable-Wwrite-stringsand will thus cause another warning.
Quoted 5 lines
It's quite dubious whether this micro-optimization really helps. We're about to write to disk anyway, which is going to be way slower than a small handful of allocations. Let's drop the optimization altogther and instead copy arguments to simplify the code and avoid the future warning with
-Wwrite-strings.
It certainly makes the final clean-up part simpler, which is a good sign.
Re: [PATCH v3 05/27] refspec: remove global tag refspec structure
In reply to Patrick SteinhardtQuoted 2 lines · Patrick Steinhardt
We have a global tag refspec structure that is used by both git-clone(1) and git-fetch(1). Initialization fo the structure will break once we
"fo" -> "of".
Quoted 109 lines
enable
-Wwrite-strings, even though the breakage is harmless. While we could just add casts, the structure isn't really required in the first place as we can simply initialize the structures at the respective callsites.Refactor the code accordingly.
Signed-off-by Patrick Steinhardt <[email protected]>--- builtin/clone.c | 8 ++++++-- builtin/fetch.c | 11 ++++++++--- refspec.c | 13 ------------- refspec.h | 1 - 4 files changed, 14 insertions(+), 19 deletions(-)builtin/clone.c +6
-2@@ -523,6 +523,9 @@ static struct ref *wanted_peer_refs(const struct ref *refs,struct ref *head =copy_ref (find_ref_by_name (refs,"HEAD" ));struct ref *local_refs = head;struct ref **tail = head ? &head->next : &local_refs; +struct refspec_item tag_refspec; + +refspec_item_init (&tag_refspec,TAG_REFSPEC ,0 );if (option_single_branch) {struct ref *remote_head =NULL ;@@ -545,7 +548,7 @@ static struct ref *wanted_peer_refs(const struct ref *refs, &tail, 0);/* if --branch=tag, pull the requested tag explicitly */ -get_fetch_map (remote_head, tag_refspec, &tail,0 ); +get_fetch_map (remote_head, &tag_refspec, &tail,0 ); }free_refs (remote_head); }else {@@ -555,8 +558,9 @@ static struct ref *wanted_peer_refs(const struct ref *refs, }if (!option_mirror && !option_single_branch && !option_no_tags) -get_fetch_map (refs, tag_refspec, &tail,0 ); +get_fetch_map (refs, &tag_refspec, &tail,0 ); +refspec_item_clear (&tag_refspec);return local_refs; }builtin/fetch.c +8
-3@@ -582,11 +582,16 @@ static struct ref *get_ref_map(struct remote *remote, } } -if (tags ==TAGS_SET ) +if (tags ==TAGS_SET ) { +struct refspec_item tag_refspec; +/* also fetch all tags */ -get_fetch_map (remote_refs, tag_refspec, &tail,0 ); -else if (tags ==TAGS_DEFAULT && *autotags) +refspec_item_init (&tag_refspec,TAG_REFSPEC ,0 ); +get_fetch_map (remote_refs, &tag_refspec, &tail,0 ); +refspec_item_clear (&tag_refspec); + }else if (tags ==TAGS_DEFAULT && *autotags) {find_non_local_tags (remote_refs,NULL , &ref_map, &tail); + }/* Now append any refs to be updated opportunistically: */ *tail = orefs;refspec.c +0
-13@@ -7,19 +7,6 @@#include "refspec.h" #include "strbuf.h" -static struct refspec_item s_tag_refspec = { - .force =0 , - .pattern =1 , - .matching =0 , - .exact_sha1 =0 , - .negative =0 , - .src ="refs/tags/*" , - .dst ="refs/tags/*" , -}; - -/* See TAG_REFSPEC for the string version */ -const struct refspec_item *tag_refspec = &s_tag_refspec; -/* * Parses the provided refspec 'refspec' and populates the refspec_item 'item'. * Returns 1 if successful and 0 if the refspec is invalid. refspec.h +0
-1@@ -2,7 +2,6 @@#define REFSPEC_H #define TAG_REFSPEC "refs/tags/*:refs/tags/*" -extern const struct refspec_item *tag_refspec; /** * A struct refspec_item holds the parsed interpretation of a refspec. If it
Re: [PATCH v3 15/27] compat/win32: fix const-correctness with string constants
In reply to Eric SunshineQuoted 15 lines · Eric Sunshine
Quoted 14 lines · Patrick Steinhardt
Adjust various places in our Win32 compatibility layer where we are not assigning string constants to
const char *variables.Signed-off-by Patrick Steinhardt <[email protected]>---
compat/basename.c +4
-1@@ -1,6 +1,8 @@ +static char current_directory[] ="." ;@@ -10,7 +12,13 @@ char *gitbasename (char *path)if (!path || !*path) -return "." ; +/* +* basename(3P) is mis-specified because it returns a +* non-constant pointer even though it is specified to return a
Quoted 8 lines
compat/basename.c char *gitbasename (char *path) · line 21
Quoted 4 lines
compat/basename.c +4
-0+* pointer to internal memory at times. The cast is a result of +* that. +*/ +return (char *)"" ;The change from returning "." to returning "" is unexplained by the commit message. Did you mean to return the newly-introduced
current_directoryinstead?
I suspect that these places wanted to return (char *) "." instead, without introducing a new variable.
Re: [PATCH v3 15/27] compat/win32: fix const-correctness with string constants
Quoted 26 lines · Junio C Hamano
Quoted 15 lines · Eric Sunshine
Quoted 14 lines · Patrick Steinhardt
Adjust various places in our Win32 compatibility layer where we are not assigning string constants to
const char *variables.Signed-off-by Patrick Steinhardt <[email protected]>---
compat/basename.c +4
-1@@ -1,6 +1,8 @@ +static char current_directory[] ="." ;@@ -10,7 +12,13 @@ char *gitbasename (char *path)if (!path || !*path) -return "." ; +/* +* basename(3P) is mis-specified because it returns a +* non-constant pointer even though it is specified to return a Quoted 8 lines
compat/basename.c char *gitbasename (char *path) · line 21
Quoted 4 lines
compat/basename.c +4
-0+* pointer to internal memory at times. The cast is a result of +* that. +*/ +return (char *)"" ;The change from returning "." to returning "" is unexplained by the commit message. Did you mean to return the newly-introduced
current_directoryinstead?
Quoted 2 lines
I suspect that these places wanted to return (char *) "." instead, without introducing a new variable.
Oof, that's bad. Thanks for catching this!
Patrick
v4 cover Compile with `-Wwrite-strings`
In reply to Patrick SteinhardtHi,
this is another minor reroll of my patch series that prepares the code base to compile with -Wwrite-strings.
There are only some small changes compared to v3:
- Fix typos in some commit messages.
- Fix accidental conversion of "." to "" in basename/dirname compatibility code. Also, remove the unused variable.
Thanks for your reviews!
Patrick
Patrick Steinhardt (27):
global: improve const correctness when assigning string constants
global: convert intentionally-leaking config strings to consts refs/reftable: stop micro-optimizing refname allocations on copy
reftable: cast away constness when assigning constants to records
refspec: remove global tag refspec structure builtin/remote: cast away constness in get_head_names()
diff: cast string constant in fill_textconv()
line-log: stop assigning string constant to file parent buffer
line-log: always allocate the output prefix
entry: refactor how we remove items for delayed checkouts
ident: add casts for fallback name and GECOS
object-file: mark cached object buffers as const
object-file: make buf parameter of index_mem() a constant
pretty: add casts for decoration option pointers compat/win32: fix const-correctness with string constants
http: do not assign string constant to non-const field
parse-options: cast long name for OPTION_ALIAS
send-pack: always allocate receive status
remote-curl: avoid assigning string constant to non-const variable
revision: always store allocated strings in output encoding
mailmap: always store allocated strings in mailmap blob
imap-send: drop global imap_server_conf variable
imap-send: fix leaking memory in imap_server_conf builtin/rebase: do not assign default backend to non-constant field builtin/rebase: always store allocated string in options.strategy builtin/merge: always store allocated strings in pull_twohead config.mak.dev: enable -Wwrite-strings warning
builtin/bisect.c | 3 +- builtin/blame.c | 2 +- builtin/bugreport.c | 2 +- builtin/check-ignore.c | 4 +- builtin/clone.c | 14 ++-- builtin/commit.c | 6 +- builtin/diagnose.c | 2 +- builtin/fetch.c | 11 ++- builtin/log.c | 2 +- builtin/mailsplit.c | 4 +- builtin/merge.c | 18 +++-- builtin/pull.c | 52 +++++++------- builtin/rebase.c | 81 ++++++++++++---------- builtin/receive-pack.c | 4 +- builtin/remote.c | 12 ++-- builtin/revert.c | 2 +- builtin/send-pack.c | 2 + compat/basename.c | 16 ++++- compat/mingw.c | 28 ++++---- compat/regex/regcomp.c | 2 +- compat/winansi.c | 2 +- config.mak.dev | 1 + diff.c | 6 +- diffcore-rename.c | 6 +- entry.c | 14 ++-- fmt-merge-msg.c | 2 +- fsck.c | 2 +- fsck.h | 2 +- gpg-interface.c | 6 +- http-backend.c | 2 +- http.c | 5 +- ident.c | 4 +- imap-send.c | 130 ++++++++++++++++++++--------------- line-log.c | 22 +++--- mailmap.c | 2 +- merge-ll.c | 11 ++- object-file.c | 23 ++++--- parse-options.h | 2 +- pretty.c | 6 +- refs.c | 2 +- refs.h | 2 +- refs/reftable-backend.c | 28 ++++---- refspec.c | 13 ---- refspec.h | 1 - reftable/basics.c | 15 ++-- reftable/basics.h | 4 +- reftable/basics_test.c | 4 +- reftable/block_test.c | 2 +- reftable/merged_test.c | 44 ++++++------ reftable/readwrite_test.c | 32 ++++----- reftable/record.c | 6 +- reftable/stack.c | 10 +-- reftable/stack_test.c | 56 +++++++-------- remote-curl.c | 53 +++++++------- revision.c | 3 +- run-command.c | 2 +- send-pack.c | 2 +- t/helper/test-hashmap.c | 3 +- t/helper/test-json-writer.c | 10 +-- t/helper/test-regex.c | 4 +- t/helper/test-rot13-filter.c | 5 +- t/t3900-i18n-commit.sh | 1 + t/t3901-i18n-patch.sh | 1 + t/unit-tests/t-strbuf.c | 10 +-- trailer.c | 2 +- userdiff.c | 10 +-- userdiff.h | 12 ++-- wt-status.c | 2 +- 68 files changed, 468 insertions(+), 386 deletions(-)
Range-diff against v3:
1: e01fde88fe = 1: e01fde88fe global: improve const correctness when assigning string constants 2: 92cb0b28c6 = 2: 92cb0b28c6 global: convert intentionally-leaking config strings to consts 3: 085d90c8b6 ! 3: 379145478c refs/reftable: stop micro-optimizing refname allocations on copy
@@ Commit message
refs/reftable: stop micro-optimizing refname allocations on copy
When copying refs, we execute write_copy_table() to write the new
- table. As the names arge given to use via arg->newname and
+ table. As the names are given to us via arg->newname and
arg->oldname, respectively, we optimize away some allocations by
- assigning those fields to the reftable records we are about to write.
- This requires us to cast the input to char * pointers as they are in
- fact constant strings. Later on, we then unset the refname for all of
- the records before calling reftable_log_record_release() on them.
+ assigning those fields to the reftable records we are about to write
+ directly, without duplicating them. This requires us to cast the input
+ to char * pointers as they are in fact constant strings. Later on, we
+ then unset the refname for all of the records before calling
+ reftable_log_record_release() on them.
We also do this when assigning the "HEAD" constant, but here we do not cast because its type is char[] by default. It's about to be turned
4: 8692d9d9af = 4: d0a2a2f6c5 reftable: cast away constness when assigning constants to records 5: db4d062014 ! 5: ead27d3d97 refspec: remove global tag refspec structure
@@ Commit message
refspec: remove global tag refspec structure
We have a global tag refspec structure that is used by both git-clone(1)
- and git-fetch(1). Initialization fo the structure will break once we
+ and git-fetch(1). Initialization of the structure will break once we
enable -Wwrite-strings, even though the breakage is harmless. While we could just add casts, the structure isn't really required in the first place as we can simply initialize the structures at the respective
6: 6a3c8d351e = 6: 7cb5df9182 builtin/remote: cast away constness in `get_head_names()`
7: 750429472a = 7: 6e631a9ea4 diff: cast string constant in `fill_textconv()`
8: cc8fa1896d = 8: ac164651a3 line-log: stop assigning string constant to file parent buffer
9: 03dbdd235b = 9: b717af02f0 line-log: always allocate the output prefix
10: 6fcb7d6685 = 10: b46dd3210d entry: refactor how we remove items for delayed checkouts
11: 81e20a7bb8 = 11: 030dbd0288 ident: add casts for fallback name and GECOS
12: 384b4c8967 = 12: ecca8e973d object-file: mark cached object buffers as const
13: a1e8e77641 = 13: 62f0e47f94 object-file: make `buf` parameter of `index_mem()` a constant
14: 4d95abe9cc = 14: e057ead2b4 pretty: add casts for decoration option pointers
15: 3d92528125 ! 15: 06b6120d26 compat/win32: fix const-correctness with string constants
@@ Commit message
Signed-off-by: Patrick Steinhardt <[email protected]>
## compat/basename.c ##
-@@
- #include "../git-compat-util.h"
- #include "../strbuf.h"
-
-+static char current_directory[] = ".";
-+
- /* Adapted from libiberty's basename.c. */
- char *gitbasename (char *path)
- {
@@ compat/basename.c: char *gitbasename (char *path)
skip_dos_drive_prefix(&path);
@@ compat/basename.c: char *gitbasename (char *path)
+ * pointer to internal memory at times. The cast is a result of
+ * that.
+ */
-+ return (char *) "";
++ return (char *) ".";
for (base = path; *path; path++) {
if (!is_dir_sep(*path))
@@ compat/basename.c: char *gitdirname(char *path)
+ * pointer to internal memory at times. The cast is a result of
+ * that.
+ */
-+ return (char *) "";
++ return (char *) ".";
if ((dos_drive_prefix = skip_dos_drive_prefix(&p)) && !*p)
goto dot;
16: 8a98078439 = 16: a8ef39d73d http: do not assign string constant to non-const field
17: 26c4c76c86 = 17: 9d596a07c5 parse-options: cast long name for OPTION_ALIAS
18: e3227bd3f3 = 18: 4019b532f9 send-pack: always allocate receive status
19: af82e49682 = 19: f2f1ada143 remote-curl: avoid assigning string constant to non-const variable
20: 077f10d0dc = 20: 27660b908c revision: always store allocated strings in output encoding
21: fb240598b4 = 21: ef43c1b18f mailmap: always store allocated strings in mailmap blob
22: 291030faa7 = 22: 0a69ce4b44 imap-send: drop global `imap_server_conf` variable
23: 9b376a313f = 23: 9ccafd286b imap-send: fix leaking memory in `imap_server_conf`
24: 0a84d66e68 = 24: e19457d20c builtin/rebase: do not assign default backend to non-constant field
25: 5c8bee3695 = 25: f548241960 builtin/rebase: always store allocated string in `options.strategy`
26: 84c0149c8f = 26: 78ac075644 builtin/merge: always store allocated strings in `pull_twohead`
27: 3427547134 = 27: 0cd4ce07d8 config.mak.dev: enable `-Wwrite-strings` warningSignature · 1 line
2.45.1.410.g58bac47f8e.dirty
PATCH v4 1/27 global: improve const correctness when assigning string constants
We're about to enable -Wwrite-strings, which changes the type of string constants to const char[]. Fix various sites where we assign such constants to non-const variables.
--- builtin/bisect.c | 3 ++- builtin/blame.c | 2 +- builtin/bugreport.c | 2 +- builtin/check-ignore.c | 4 +-- builtin/clone.c | 6 ++--- builtin/commit.c | 6 ++--- builtin/diagnose.c | 2 +- builtin/log.c | 2 +- builtin/mailsplit.c | 4 +-- builtin/pull.c | 52 ++++++++++++++++++------------------ builtin/receive-pack.c | 4 +-- builtin/revert.c | 2 +- compat/regex/regcomp.c | 2 +- diff.c | 4 +-- diffcore-rename.c | 6 ++--- fmt-merge-msg.c | 2 +- fsck.c | 2 +- fsck.h | 2 +- gpg-interface.c | 2 +- http-backend.c | 2 +- imap-send.c | 6 ++--- pretty.c | 2 +- refs.c | 2 +- refs.h | 2 +- reftable/basics.c | 15 +++++------ reftable/basics.h | 4 +-- reftable/basics_test.c | 4 +-- reftable/record.c | 6 ++--- reftable/stack.c | 10 ++++--- reftable/stack_test.c | 8 +++--- run-command.c | 2 +- t/helper/test-hashmap.c | 3 ++- t/helper/test-json-writer.c | 10 +++---- t/helper/test-regex.c | 4 +-- t/helper/test-rot13-filter.c | 5 ++-- t/unit-tests/t-strbuf.c | 10 ++++--- trailer.c | 2 +- wt-status.c | 2 +- 38 files changed, 106 insertions(+), 102 deletions(-)
builtin/bisect.c +2 -1
@@ -262,7 +262,8 @@ static int bisect_reset(const char *commit)return bisect_clean_state (); } -static void log_commit (FILE *fp,char *fmt,const char *state, +static void log_commit (FILE *fp, +const char *fmt,const char *state,struct commit *commit) {struct pretty_print_context pp = {0 };
builtin/blame.c +1 -1
@@ -134,7 +134,7 @@ static void get_ac_line(const char *inbuf, const char *what, {struct ident_split ident;size_t len, maillen, namelen; -char *tmp, *endp; +const char *tmp, *endp;const char *namebuf, *mailbuf; tmp =strstr (inbuf, what);
builtin/bugreport.c +1 -1
@@ -107,7 +107,7 @@ int cmd_bugreport(int argc, const char **argv, const char *prefix)struct tm tm;enum diagnose_mode diagnose =DIAGNOSE_NONE ;char *option_output =NULL ; -char *option_suffix ="%Y-%m-%d-%H%M" ; +const char *option_suffix ="%Y-%m-%d-%H%M" ;const char *user_relative_path =NULL ;char *prefixed_filename;size_t output_path_len;
builtin/check-ignore.c +2 -2
@@ -35,8 +35,8 @@ static const struct option check_ignore_options[] = {static void output_pattern (const char *path,struct path_pattern *pattern) { -char *bang = (pattern && pattern->flags &PATTERN_FLAG_NEGATIVE ) ?"!" :"" ; -char *slash = (pattern && pattern->flags &PATTERN_FLAG_MUSTBEDIR ) ?"/" :"" ; +const char *bang = (pattern && pattern->flags &PATTERN_FLAG_NEGATIVE ) ?"!" :"" ; +const char *slash = (pattern && pattern->flags &PATTERN_FLAG_MUSTBEDIR ) ?"/" :"" ;if (!nul_term_line) {if (!verbose) {write_name_quoted (path, stdout,'\n' );
builtin/clone.c +3 -3
@@ -71,7 +71,7 @@ static char *option_branch = NULL;static struct string_list option_not =STRING_LIST_INIT_NODUP ;static const char *real_git_dir;static const char *ref_format; -static char *option_upload_pack ="git-upload-pack" ; +static const char *option_upload_pack ="git-upload-pack" ;static int option_verbosity;static int option_progress =-1 ;static int option_sparse_checkout;
@@ -177,8 +177,8 @@ static struct option builtin_clone_options[] = {static const char *get_repo_path_1 (struct strbuf *path,int *is_bundle) { -static char *suffix[] = {"/.git" ,"" ,".git/.git" ,".git" }; -static char *bundle_suffix[] = {".bundle" ,"" }; +static const char *suffix[] = {"/.git" ,"" ,".git/.git" ,".git" }; +static const char *bundle_suffix[] = {".bundle" ,"" };size_t baselen = path->len;struct stat st;int i;
builtin/commit.c +3 -3
@@ -113,7 +113,7 @@ static char *template_file;* the commit message and/or authorship. */ static const char *author_message, *author_message_buffer; -static char *edit_message, *use_message; +static const char *edit_message, *use_message;static char *fixup_message, *fixup_commit, *squash_message;static const char *fixup_prefix;static int all, also, interactive, patch_interactive, only, amend, signoff;
@@ -121,8 +121,8 @@ static int edit_flag = -1; /* unspecified */static int quiet, verbose, no_verify, allow_empty, dry_run, renew_authorship;static int config_commit_verbose =-1 ;/* unspecified */ static int no_post_rewrite, allow_empty_message, pathspec_file_nul; -static char *untracked_files_arg, *force_date, *ignore_submodule_arg, *ignored_arg; -static char *sign_commit, *pathspec_from_file; +static const char *untracked_files_arg, *force_date, *ignore_submodule_arg, *ignored_arg; +static const char *sign_commit, *pathspec_from_file;static struct strvec trailer_args =STRVEC_INIT ;/*
builtin/diagnose.c +1 -1
@@ -18,7 +18,7 @@ int cmd_diagnose(int argc, const char **argv, const char *prefix)struct tm tm;enum diagnose_mode mode =DIAGNOSE_STATS ;char *option_output =NULL ; -char *option_suffix ="%Y-%m-%d-%H%M" ; +const char *option_suffix ="%Y-%m-%d-%H%M" ;char *prefixed_filename;const struct option diagnose_options[] = {
builtin/log.c +1 -1
@@ -1283,7 +1283,7 @@ static void get_patch_ids(struct rev_info *rev, struct patch_ids *ids) o2->flags = flags2; } -static void gen_message_id (struct rev_info *info,char *base) +static void gen_message_id (struct rev_info *info,const char *base) {struct strbuf buf =STRBUF_INIT ; strbuf_addf(&buf, "%s.%"PRItime".git.%s", base,
builtin/mailsplit.c +2 -2
@@ -113,8 +113,8 @@ static int populate_maildir_list(struct string_list *list, const char *path)DIR *dir;struct dirent *dent;char *name =NULL ; -char *subs[] = {"cur" ,"new" ,NULL }; -char **sub; +const char *subs[] = {"cur" ,"new" ,NULL }; +const char **sub;int ret =-1 ;for (sub = subs; *sub; ++sub) {
builtin/pull.c +26 -26
74 lines not on this page · raw message
builtin/receive-pack.c +2 -2
@@ -1249,7 +1249,7 @@ static int run_proc_receive_hook(struct command *commands,return code; } -static char *refuse_unconfigured_deny_msg = +static const char *refuse_unconfigured_deny_msg =N_ ("By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" "with what you pushed, and will require 'git reset --hard' to match\n"
@@ -1269,7 +1269,7 @@ static void refuse_unconfigured_deny(void)rp_error ("%s" ,_ (refuse_unconfigured_deny_msg)); } -static char *refuse_unconfigured_deny_delete_current_msg = +static const char *refuse_unconfigured_deny_delete_current_msg =N_ ("By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" "\n"
builtin/revert.c +1 -1
@@ -179,7 +179,7 @@ static int run_sequencer(int argc, const char **argv, const char *prefix,/* Check for incompatible command line arguments */ if (cmd) { -char *this_operation; +const char *this_operation;if (cmd =='q' ) this_operation ="--quit" ;else if (cmd =='c' )
compat/regex/regcomp.c +1 -1
@@ -848,7 +848,7 @@ init_dfa (re_dfa_t *dfa, size_t pat_len) {unsigned int table_size;#ifndef _LIBC -char *codeset_name; +const char *codeset_name;#endif memset (dfa,'\0' ,sizeof (re_dfa_t));
diff.c +2 -2
@@ -3764,7 +3764,7 @@ static void builtin_diff(const char *name_a,return ; } -static char *get_compact_summary (const struct diff_filepair *p,int is_renamed) +static const char *get_compact_summary (const struct diff_filepair *p,int is_renamed) {if (!is_renamed) {if (p->status ==DIFF_STATUS_ADDED ) {
@@ -4076,7 +4076,7 @@ static int reuse_worktree_file(struct index_state *istate,static int diff_populate_gitlink (struct diff_filespec *s,int size_only) {struct strbuf buf =STRBUF_INIT ; -char *dirty ="" ; +const char *dirty ="" ;/* Are we looking at the work tree? */ if (s->dirty_submodule)
diffcore-rename.c +3 -3
@@ -406,7 +406,7 @@ static const char *get_highest_rename_path(struct strintmap *counts)return highest_destination_dir; } -static char *UNKNOWN_DIR ="/" ;/* placeholder -- short, illegal directory */ +static const char *UNKNOWN_DIR ="/" ;/* placeholder -- short, illegal directory */ static int dir_rename_already_determinable (struct strintmap *counts) {
@@ -429,8 +429,8 @@ static int dir_rename_already_determinable(struct strintmap *counts) }static void increment_count (struct dir_rename_info *info, -char *old_dir, -char *new_dir) +const char *old_dir, +const char *new_dir) {struct strintmap *counts;struct strmap_entry *e;
fmt-merge-msg.c +1 -1
@@ -447,7 +447,7 @@ static void fmt_merge_msg_title(struct strbuf *out, const char *current_branch) {int i =0 ; -char *sep ="" ; +const char *sep ="" ;strbuf_addstr (out,"Merge " );for (i =0 ; i < srcs.nr; i++) {
fsck.c +1 -1
@@ -1231,7 +1231,7 @@ int fsck_object(struct object *obj, void *data, unsigned long size, }int fsck_buffer (const struct object_id *oid,enum object_type type, -void *data,unsigned long size, +const void *data,unsigned long size,struct fsck_options *options) {if (type ==OBJ_BLOB )
fsck.h +1 -1
@@ -202,7 +202,7 @@ int fsck_object(struct object *obj, void *data, unsigned long size,* struct. */ int fsck_buffer (const struct object_id *oid,enum object_type , -void *data,unsigned long size, +const void *data,unsigned long size,struct fsck_options *options);/*
gpg-interface.c +1 -1
@@ -727,7 +727,7 @@ static int git_gpg_config(const char *var, const char *value, void *cb UNUSED) {struct gpg_format *fmt =NULL ; -char *fmtname =NULL ; +const char *fmtname =NULL ;char *trust;int ret;
http-backend.c +1 -1
@@ -753,7 +753,7 @@ static int bad_request(struct strbuf *hdr, const struct service_cmd *c) int cmd_main(int argc UNUSED, const char **argv UNUSED) { -char *method =getenv ("REQUEST_METHOD" ); +const char *method =getenv ("REQUEST_METHOD" );const char *proto_header;char *dir;struct service_cmd *cmd =NULL ;
imap-send.c +3 -3
@@ -1215,9 +1215,9 @@ static int imap_store_msg(struct imap_store *ctx, struct strbuf *msg)static void wrap_in_html (struct strbuf *msg) {struct strbuf buf =STRBUF_INIT ; -static char *content_type ="Content-Type: text/html;\n" ; -static char *pre_open ="<pre>\n" ; -static char *pre_close ="</pre>\n" ; +static const char *content_type ="Content-Type: text/html;\n" ; +static const char *pre_open ="<pre>\n" ; +static const char *pre_close ="</pre>\n" ;const char *body =strstr (msg->buf,"\n\n" );if (!body)
pretty.c +1 -1
@@ -1325,7 +1325,7 @@ int format_set_trailers_options(struct process_trailer_options *opts, static size_t parse_describe_args(const char *start, struct strvec *args) { struct { - char *name; + const char *name; enum { DESCRIBE_ARG_BOOL, DESCRIBE_ARG_INTEGER,
refs.c +1 -1
@@ -159,7 +159,7 @@ void update_ref_namespace(enum ref_namespace namespace, char *ref) {struct ref_namespace_info *info = &ref_namespace[namespace];if (info->ref_updated) -free (info->ref); +free ((char *)info->ref); info->ref = ref; info->ref_updated =1 ; }
refs.h +1 -1
@@ -975,7 +975,7 @@ struct ref_store *get_worktree_ref_store(const struct worktree *wt);*/ struct ref_namespace_info { -char *ref; +const char *ref;enum decoration_type decoration;/*
reftable/basics.c +6 -9
@@ -67,9 +67,9 @@ void free_names(char **a)reftable_free (a); } -size_t names_length (char **names) +size_t names_length (const char **names) { -char **p = names; +const char **p = names;while (*p) p++;return p - names;
@@ -102,15 +102,12 @@ void parse_names(char *buf, int size, char ***namesp) *namesp = names; } -int names_equal (char **a,char **b) +int names_equal (const char **a,const char **b) { -int i =0 ; -for (; a[i] && b[i]; i++) { -if (strcmp (a[i], b[i])) { +size_t i =0 ; +for (; a[i] && b[i]; i++) +if (strcmp (a[i], b[i]))return 0 ; - } - } -return a[i] == b[i]; }
reftable/basics.h +2 -2
@@ -42,10 +42,10 @@ void free_names(char **a);void parse_names (char *buf,int size,char ***namesp);/* compares two NULL-terminated arrays of strings. */ -int names_equal (char **a,char **b); +int names_equal (const char **a,const char **b);/* returns the array size of a NULL-terminated array of strings. */ -size_t names_length (char **names); +size_t names_length (const char **names);/* Allocation routines; they invoke the functions set through * reftable_set_alloc() */
reftable/basics_test.c +2 -2
@@ -58,8 +58,8 @@ static void test_binsearch(void)static void test_names_length (void ) { -char *a[] = {"a" ,"b" ,NULL }; -EXPECT (names_length (a) ==2 ); +const char *names[] = {"a" ,"b" ,NULL }; +EXPECT (names_length (names) ==2 ); }static void test_parse_names_normal (void )
reftable/record.c +3 -3
@@ -116,7 +116,7 @@ static int decode_string(struct strbuf *dest, struct string_view in)return start_len - in.len; } -static int encode_string (char *str,struct string_view s) +static int encode_string (const char *str,struct string_view s) {struct string_view start = s;int l =strlen (str);
@@ -969,9 +969,9 @@ static int reftable_log_record_decode(void *rec, struct strbuf key,return REFTABLE_FORMAT_ERROR ; } -static int null_streq (char *a,char *b) +static int null_streq (const char *a,const char *b) { -char *empty ="" ; +const char *empty ="" ;if (!a) a = empty;
reftable/stack.c +6 -4
@@ -204,7 +204,8 @@ static struct reftable_reader **stack_copy_readers(struct reftable_stack *st,return cur; } -static int reftable_stack_reload_once (struct reftable_stack *st,char **names, +static int reftable_stack_reload_once (struct reftable_stack *st, +const char **names,int reuse_open) {size_t cur_len = !st->merged ?0 : st->merged->stack_len;
@@ -222,7 +223,7 @@ static int reftable_stack_reload_once(struct reftable_stack *st, char **names,while (*names) {struct reftable_reader *rd =NULL ; -char *name = *names++; +const char *name = *names++;/* this is linear; we assume compaction keeps the number of tables under control so this is not quadratic. */
@@ -354,7 +355,7 @@ static int reftable_stack_reload_maybe_reuse(struct reftable_stack *st, goto out; } - err =reftable_stack_reload_once (st, names, reuse_open); + err =reftable_stack_reload_once (st, (const char **) names, reuse_open);if (!err)break ;if (err !=REFTABLE_NOT_EXIST_ERROR )
@@ -368,7 +369,8 @@ static int reftable_stack_reload_maybe_reuse(struct reftable_stack *st, err =read_lines (st->list_file, &names_after);if (err <0 ) goto out; -if (names_equal (names_after, names)) { +if (names_equal ((const char **) names_after, + (const char **) names)) { err =REFTABLE_NOT_EXIST_ERROR ; goto out; }
reftable/stack_test.c +4 -4
@@ -83,7 +83,7 @@ static void test_read_file(void)char out[1024 ] ="line1\n\nline2\nline3" ;int n, err;char **names =NULL ; -char *want[] = {"line1" ,"line2" ,"line3" }; +const char *want[] = {"line1" ,"line2" ,"line3" };int i =0 ;EXPECT (fd >0 );
@@ -116,9 +116,9 @@ static void test_parse_names(void)static void test_names_equal (void ) { -char *a[] = {"a" ,"b" ,"c" ,NULL }; -char *b[] = {"a" ,"b" ,"d" ,NULL }; -char *c[] = {"a" ,"b" ,NULL }; +const char *a[] = {"a" ,"b" ,"c" ,NULL }; +const char *b[] = {"a" ,"b" ,"d" ,NULL }; +const char *c[] = {"a" ,"b" ,NULL };EXPECT (names_equal (a, a));EXPECT (!names_equal (a, b));
run-command.c +1 -1
@@ -663,7 +663,7 @@ int start_command(struct child_process *cmd)int need_in, need_out, need_err;int fdin[2 ], fdout[2 ], fderr[2 ];int failed_errno; -char *str; +const char *str;/* * In case of errors we must keep the promise to close FDs
t/helper/test-hashmap.c +2 -1
@@ -36,7 +36,8 @@ static int test_entry_cmp(const void *cmp_data, }static struct test_entry *alloc_test_entry (unsigned int hash, -char *key,char *value) +const char *key, +const char *value) {size_t klen =strlen (key);size_t vlen =strlen (value);
t/helper/test-json-writer.c +5 -5
@@ -174,7 +174,7 @@ static void make_arr4(int pretty)jw_end (&arr4); } -static char *expect_nest1 = +static const char *expect_nest1 ="{\"obj1\":{\"a\":\"abc\",\"b\":42,\"c\":true},\"arr1\":[\"abc\",42,true]}" ;static struct json_writer nest1 =JSON_WRITER_INIT ;
@@ -195,10 +195,10 @@ static void make_nest1(int pretty)jw_release (&arr1); } -static char *expect_inline1 = +static const char *expect_inline1 ="{\"obj1\":{\"a\":\"abc\",\"b\":42,\"c\":true},\"arr1\":[\"abc\",42,true]}" ; -static char *pretty_inline1 = +static const char *pretty_inline1 = ("{\n" " \"obj1\": {\n" " \"a\": \"abc\",\n"
@@ -236,10 +236,10 @@ static void make_inline1(int pretty)jw_end (&inline1); } -static char *expect_inline2 = +static const char *expect_inline2 ="[[1,2],[3,4],{\"a\":\"abc\"}]" ; -static char *pretty_inline2 = +static const char *pretty_inline2 = ("[\n" " [\n" " 1,\n"
t/helper/test-regex.c +2 -2
@@ -20,8 +20,8 @@ static struct reg_flag reg_flags[] = {static int test_regex_bug (void ) { -char *pat ="[^={} \t]+" ; -char *str ="={}\nfred" ; +const char *pat ="[^={} \t]+" ; +const char *str ="={}\nfred" ;regex_t r;regmatch_t m[1 ];
t/helper/test-rot13-filter.c +3 -2
@@ -136,7 +136,7 @@ static void free_delay_entries(void)strmap_clear (&delay,0 ); } -static void add_delay_entry (char *pathname,int count,int requested) +static void add_delay_entry (const char *pathname,int count,int requested) {struct delay_entry *entry =xcalloc (1 ,sizeof (*entry)); entry->count = count;
@@ -189,7 +189,8 @@ static void reply_list_available_blobs_cmd(void)static void command_loop (void ) {for (;;) { -char *buf, *output; +char *buf; +const char *output;char *pathname;struct delay_entry *entry;struct strbuf input =STRBUF_INIT ;
t/unit-tests/t-strbuf.c +6 -4
@@ -2,7 +2,8 @@#include "strbuf.h" /* wrapper that supplies tests with an empty, initialized strbuf */ -static void setup (void (*f)(struct strbuf *,void *),void *data) +static void setup (void (*f)(struct strbuf *,const void *), +const void *data) {struct strbuf buf =STRBUF_INIT ;
@@ -13,7 +14,8 @@ static void setup(void (*f)(struct strbuf*, void*), void *data) }/* wrapper that supplies tests with a populated, initialized strbuf */ -static void setup_populated (void (*f)(struct strbuf *,void *),char *init_str,void *data) +static void setup_populated (void (*f)(struct strbuf *,const void *), +const char *init_str,const void *data) {struct strbuf buf =STRBUF_INIT ;
@@ -64,7 +66,7 @@ static void t_dynamic_init(void)strbuf_release (&buf); } -static void t_addch (struct strbuf *buf,void *data) +static void t_addch (struct strbuf *buf,const void *data) {const char *p_ch = data;const char ch = *p_ch;
@@ -83,7 +85,7 @@ static void t_addch(struct strbuf *buf, void *data) check_char(buf->buf[buf->len], ==, '\0'); } -static void t_addstr (struct strbuf *buf,void *data) +static void t_addstr (struct strbuf *buf,const void *data) {const char *text = data;size_t len =strlen (text);
trailer.c +1 -1
@@ -63,7 +63,7 @@ struct arg_item {static LIST_HEAD (conf_head); -static char *separators =":" ; +static const char *separators =":" ;static int configured;
wt-status.c +1 -1
@@ -2408,7 +2408,7 @@ static void wt_porcelain_v2_print_unmerged_entry(int mode;struct object_id oid; } stages[3 ]; -char *key; +const char *key;char submodule_token[5 ];char unmerged_prefix ='u' ;char eol_char = s->null_termination ?'\0' :'\n' ;
Signature · 1 line
2.45.1.410.g58bac47f8e.dirty
PATCH v4 2/27 global: convert intentionally-leaking config strings to consts
In reply to Patrick SteinhardtThere are multiple cases where we intentionally leak config strings:
- struct gpg_format is used to track programs that can be used for signing commits, either via gpg(1), gpgsm(1) or ssh-keygen(1). The user can override the commands via several config variables. As the array is populated once, only, and the struct memers are never written to or free'd.
- struct ll_merge_driver is used to track merge drivers. Same as with the GPG format, these drivers are populated once and then reused. Its data is never written to or free'd, either.
- struct userdiff_funcname and struct userdiff_driver can be configured via diff.<driver>.* to add additional drivers. Again, these have a global lifetime and are never written to or free'd.
All of these are intentionally kept alive and are never written to. Furthermore, all of these are being assigned both string constants in some places, and allocated strings in other places. This will cause warnings once we enable -Wwrite-strings, so let's mark the respective fields as const char * and cast away the constness when assigning those values.
--- gpg-interface.c | 4 ++-- merge-ll.c | 11 ++++++++--- userdiff.c | 10 +++++----- userdiff.h | 12 ++++++------ 4 files changed, 21 insertions(+), 16 deletions(-)
gpg-interface.c +2 -2
@@ -34,7 +34,7 @@ static enum signature_trust_level configured_min_trust_level = TRUST_UNDEFINED;struct gpg_format {const char *name; -char *program; +const char *program;const char **verify_args;const char **sigs; int (*verify_signed_buffer)(struct signature_check *sigc,
@@ -783,7 +783,7 @@ static int git_gpg_config(const char *var, const char *value,if (fmtname) { fmt =get_format_by_name (fmtname); -return git_config_string (&fmt->program, var, value); +return git_config_string ((char **) &fmt->program, var, value); }return 0 ;
merge-ll.c +8 -3
@@ -27,7 +27,7 @@ typedef enum ll_merge_result (*ll_merge_fn)(const struct ll_merge_driver *,struct ll_merge_driver {const char *name; -char *description; +const char *description;ll_merge_fn fn;char *recursive;struct ll_merge_driver *next;
@@ -304,8 +304,13 @@ static int read_merge_config(const char *var, const char *value, ll_user_merge_tail = &(fn->next); } -if (!strcmp ("name" , key)) -return git_config_string (&fn->description, var, value); +if (!strcmp ("name" , key)) { +/* +* The description is leaking, but that's okay as we want to +* keep around the merge drivers anyway. +*/ +return git_config_string ((char **) &fn->description, var, value); + }if (!strcmp ("driver" , key)) {if (!value)
userdiff.c +5 -5
@@ -399,7 +399,7 @@ static struct userdiff_driver *userdiff_find_by_namelen(const char *name, size_tstatic int parse_funcname (struct userdiff_funcname *f,const char *k,const char *v,int cflags) { -if (git_config_string (&f->pattern, k, v) <0 ) +if (git_config_string ((char **) &f->pattern, k, v) <0 )return -1 ; f->cflags = cflags;return 0 ;
@@ -445,15 +445,15 @@ int userdiff_config(const char *k, const char *v)if (!strcmp (type,"binary" ))return parse_tristate (&drv->binary, k, v);if (!strcmp (type,"command" )) -return git_config_string (&drv->external, k, v); +return git_config_string ((char **) &drv->external, k, v);if (!strcmp (type,"textconv" )) -return git_config_string (&drv->textconv, k, v); +return git_config_string ((char **) &drv->textconv, k, v);if (!strcmp (type,"cachetextconv" ))return parse_bool (&drv->textconv_want_cache, k, v);if (!strcmp (type,"wordregex" )) -return git_config_string (&drv->word_regex, k, v); +return git_config_string ((char **) &drv->word_regex, k, v);if (!strcmp (type,"algorithm" )) -return git_config_string (&drv->algorithm, k, v); +return git_config_string ((char **) &drv->algorithm, k, v);return 0 ; }
userdiff.h +6 -6
@@ -7,19 +7,19 @@ struct index_state;struct repository ;struct userdiff_funcname { -char *pattern; +const char *pattern;int cflags; };struct userdiff_driver {const char *name; -char *external; -char *algorithm; +const char *external; +const char *algorithm;int binary;struct userdiff_funcname funcname; -char *word_regex; -char *word_regex_multi_byte; -char *textconv; +const char *word_regex; +const char *word_regex_multi_byte; +const char *textconv;struct notes_cache *textconv_cache;int textconv_want_cache; };
Signature · 1 line
2.45.1.410.g58bac47f8e.dirty
PATCH v4 3/27 refs/reftable: stop micro-optimizing refname allocations on copy
In reply to Patrick SteinhardtWhen copying refs, we execute write_copy_table() to write the new table. As the names are given to us via arg->newname and arg->oldname, respectively, we optimize away some allocations by assigning those fields to the reftable records we are about to write directly, without duplicating them. This requires us to cast the input to char * pointers as they are in fact constant strings. Later on, we then unset the refname for all of the records before calling reftable_log_record_release() on them.
We also do this when assigning the "HEAD" constant, but here we do not cast because its type is char[] by default. It's about to be turned into const char * though once we enable -Wwrite-strings and will thus cause another warning.
It's quite dubious whether this micro-optimization really helps. We're about to write to disk anyway, which is going to be way slower than a small handful of allocations. Let's drop the optimization altogther and instead copy arguments to simplify the code and avoid the future warning with -Wwrite-strings.
--- refs/reftable-backend.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-)
refs/reftable-backend.c +16 -12
@@ -1340,10 +1340,10 @@ static int write_copy_table(struct reftable_writer *writer, void *cb_data)* old reference. */ refs[0 ] = old_ref; - refs[0 ].refname = (char *)arg->newname; + refs[0 ].refname =xstrdup (arg->newname); refs[0 ].update_index = creation_ts;if (arg->delete_old) { - refs[1 ].refname = (char *)arg->oldname; + refs[1 ].refname =xstrdup (arg->oldname); refs[1 ].value_type =REFTABLE_REF_DELETION ; refs[1 ].update_index = deletion_ts; }
@@ -1366,7 +1366,7 @@ static int write_copy_table(struct reftable_writer *writer, void *cb_data)ALLOC_GROW (logs, logs_nr +1 , logs_alloc);memset (&logs[logs_nr],0 ,sizeof (logs[logs_nr]));fill_reftable_log_record (&logs[logs_nr], &committer_ident); - logs[logs_nr].refname = (char *)arg->newname; + logs[logs_nr].refname =xstrdup (arg->newname); logs[logs_nr].update_index = deletion_ts; logs[logs_nr].value.update.message =xstrndup (arg->logmsg, arg->refs->write_options.block_size /2 );
@@ -1387,7 +1387,13 @@ static int write_copy_table(struct reftable_writer *writer, void *cb_data)if (append_head_reflog) {ALLOC_GROW (logs, logs_nr +1 , logs_alloc); logs[logs_nr] = logs[logs_nr -1 ]; - logs[logs_nr].refname ="HEAD" ; + logs[logs_nr].refname =xstrdup ("HEAD" ); + logs[logs_nr].value.update.name = +xstrdup (logs[logs_nr].value.update.name); + logs[logs_nr].value.update.email = +xstrdup (logs[logs_nr].value.update.email); + logs[logs_nr].value.update.message = +xstrdup (logs[logs_nr].value.update.message); logs_nr++; } }
@@ -1398,7 +1404,7 @@ static int write_copy_table(struct reftable_writer *writer, void *cb_data)ALLOC_GROW (logs, logs_nr +1 , logs_alloc);memset (&logs[logs_nr],0 ,sizeof (logs[logs_nr]));fill_reftable_log_record (&logs[logs_nr], &committer_ident); - logs[logs_nr].refname = (char *)arg->newname; + logs[logs_nr].refname =xstrdup (arg->newname); logs[logs_nr].update_index = creation_ts; logs[logs_nr].value.update.message =xstrndup (arg->logmsg, arg->refs->write_options.block_size /2 );
@@ -1430,7 +1436,7 @@ static int write_copy_table(struct reftable_writer *writer, void *cb_data)*/ ALLOC_GROW (logs, logs_nr +1 , logs_alloc); logs[logs_nr] = old_log; - logs[logs_nr].refname = (char *)arg->newname; + logs[logs_nr].refname =xstrdup (arg->newname); logs_nr++;/*
@@ -1439,7 +1445,7 @@ static int write_copy_table(struct reftable_writer *writer, void *cb_data)if (arg->delete_old) {ALLOC_GROW (logs, logs_nr +1 , logs_alloc);memset (&logs[logs_nr],0 ,sizeof (logs[logs_nr])); - logs[logs_nr].refname = (char *)arg->oldname; + logs[logs_nr].refname =xstrdup (arg->oldname); logs[logs_nr].value_type =REFTABLE_LOG_DELETION ; logs[logs_nr].update_index = old_log.update_index; logs_nr++;
@@ -1462,13 +1468,11 @@ static int write_copy_table(struct reftable_writer *writer, void *cb_data)reftable_iterator_destroy (&it);string_list_clear (&skip,0 );strbuf_release (&errbuf); -for (i =0 ; i < logs_nr; i++) { -if (!strcmp (logs[i].refname,"HEAD" )) -continue ; - logs[i].refname =NULL ; +for (i =0 ; i < logs_nr; i++)reftable_log_record_release (&logs[i]); - }free (logs); +for (i =0 ; i <ARRAY_SIZE (refs); i++) +reftable_ref_record_release (&refs[i]);reftable_ref_record_release (&old_ref);reftable_log_record_release (&old_log);return ret;
Signature · 1 line
2.45.1.410.g58bac47f8e.dirty
PATCH v4 4/27 reftable: cast away constness when assigning constants to records
In reply to Patrick SteinhardtThe reftable records are used in multiple ways throughout the reftable library. In many of those cases they merely act as input to a function without getting modified by it at all. Most importantly, this happens when writing records and when querying for records.
We rely on this in our tests and thus assign string constants to those fields, which is about to generate warnings as those fields are of type char *. While we could go through the process and instead allocate those strings in all of our tests, this feels quite unnecessary.
Instead, add casts to char * for all of those strings. As this is part of our tests, this also nicely serves as a demonstration that nothing writes or frees those string constants, which would otherwise lead to segfaults.
--- reftable/block_test.c | 2 +- reftable/merged_test.c | 44 +++++++++++++++++------------------ reftable/readwrite_test.c | 32 +++++++++++++------------- reftable/stack_test.c | 48 +++++++++++++++++++-------------------- 4 files changed, 63 insertions(+), 63 deletions(-)
reftable/block_test.c +1 -1
@@ -42,7 +42,7 @@ static void test_block_read_write(void)block_writer_init (&bw,BLOCK_TYPE_REF , block.data, block_size, header_off,hash_size (GIT_SHA1_FORMAT_ID )); - rec.u.ref.refname ="" ; + rec.u.ref.refname = (char *)"" ; rec.u.ref.value_type =REFTABLE_REF_DELETION ; n =block_writer_add (&bw, &rec);EXPECT (n ==REFTABLE_API_ERROR );
reftable/merged_test.c +22 -22
126 lines not on this page · raw message
reftable/readwrite_test.c +16 -16
@@ -86,7 +86,7 @@ static void write_table(char ***names, struct strbuf *buf, int N, log.update_index = update_index; log.value_type =REFTABLE_LOG_UPDATE ;set_test_hash (log.value.update.new_hash, i); - log.value.update.message ="message" ; + log.value.update.message = (char *)"message" ; n =reftable_writer_add_log (w, &log);EXPECT (n ==0 );
@@ -118,15 +118,15 @@ static void test_log_buffer_size(void)int err;int i;struct reftable_log_record - log = { .refname ="refs/heads/master" , + log = { .refname = (char *)"refs/heads/master" , .update_index =0xa , .value_type =REFTABLE_LOG_UPDATE , .value = { .update = { - .name ="Han-Wen Nienhuys" , - .email ="[email protected]" , + .name = (char *)"Han-Wen Nienhuys" , + .email = (char *)"[email protected]" , .tz_offset =100 , .time =0x5e430672 , - .message ="commit: 9\n" , + .message = (char *)"commit: 9\n" , } } };struct reftable_writer *w =reftable_new_writer (&strbuf_add_void, &noop_flush, &buf, &opts);
@@ -156,15 +156,15 @@ static void test_log_overflow(void) };int err;struct reftable_log_record log = { - .refname ="refs/heads/master" , + .refname = (char *)"refs/heads/master" , .update_index =0xa , .value_type =REFTABLE_LOG_UPDATE , .value = { .update = { .old_hash = {1 }, .new_hash = {2 }, - .name ="Han-Wen Nienhuys" , - .email ="[email protected]" , + .name = (char *)"Han-Wen Nienhuys" , + .email = (char *)"[email protected]" , .tz_offset =100 , .time =0x5e430672 , .message = msg,
@@ -293,14 +293,14 @@ static void test_log_zlib_corruption(void)char message[100 ] = {0 };int err, i, n;struct reftable_log_record log = { - .refname ="refname" , + .refname = (char *)"refname" , .value_type =REFTABLE_LOG_UPDATE , .value = { .update = { .new_hash = {1 }, .old_hash = {2 }, - .name ="My Name" , - .email ="myname@invalid" , + .name = (char *)"My Name" , + .email = (char *)"myname@invalid" , .message = message, }, },
@@ -728,7 +728,7 @@ static void test_write_empty_key(void)struct reftable_writer *w =reftable_new_writer (&strbuf_add_void, &noop_flush, &buf, &opts);struct reftable_ref_record ref = { - .refname ="" , + .refname = (char *)"" , .update_index =1 , .value_type =REFTABLE_REF_DELETION , };
@@ -752,18 +752,18 @@ static void test_write_key_order(void)reftable_new_writer (&strbuf_add_void, &noop_flush, &buf, &opts);struct reftable_ref_record refs[2 ] = { { - .refname ="b" , + .refname = (char *)"b" , .update_index =1 , .value_type =REFTABLE_REF_SYMREF , .value = { - .symref ="target" , + .symref = (char *)"target" , }, }, { - .refname ="a" , + .refname = (char *)"a" , .update_index =1 , .value_type =REFTABLE_REF_SYMREF , .value = { - .symref ="target" , + .symref = (char *)"target" , }, } };
reftable/stack_test.c +24 -24
152 lines not on this page · raw message
Signature · 1 line
2.45.1.410.g58bac47f8e.dirty
PATCH v4 5/27 refspec: remove global tag refspec structure
In reply to Patrick SteinhardtWe have a global tag refspec structure that is used by both git-clone(1) and git-fetch(1). Initialization of the structure will break once we enable -Wwrite-strings, even though the breakage is harmless. While we could just add casts, the structure isn't really required in the first place as we can simply initialize the structures at the respective callsites.
Refactor the code accordingly.
--- builtin/clone.c | 8 ++++++-- builtin/fetch.c | 11 ++++++++--- refspec.c | 13 ------------- refspec.h | 1 - 4 files changed, 14 insertions(+), 19 deletions(-)
builtin/clone.c +6 -2
@@ -523,6 +523,9 @@ static struct ref *wanted_peer_refs(const struct ref *refs,struct ref *head =copy_ref (find_ref_by_name (refs,"HEAD" ));struct ref *local_refs = head;struct ref **tail = head ? &head->next : &local_refs; +struct refspec_item tag_refspec; + +refspec_item_init (&tag_refspec,TAG_REFSPEC ,0 );if (option_single_branch) {struct ref *remote_head =NULL ;
@@ -545,7 +548,7 @@ static struct ref *wanted_peer_refs(const struct ref *refs, &tail, 0);/* if --branch=tag, pull the requested tag explicitly */ -get_fetch_map (remote_head, tag_refspec, &tail,0 ); +get_fetch_map (remote_head, &tag_refspec, &tail,0 ); }free_refs (remote_head); }else {
@@ -555,8 +558,9 @@ static struct ref *wanted_peer_refs(const struct ref *refs, }if (!option_mirror && !option_single_branch && !option_no_tags) -get_fetch_map (refs, tag_refspec, &tail,0 ); +get_fetch_map (refs, &tag_refspec, &tail,0 ); +refspec_item_clear (&tag_refspec);return local_refs; }
builtin/fetch.c +8 -3
@@ -582,11 +582,16 @@ static struct ref *get_ref_map(struct remote *remote, } } -if (tags ==TAGS_SET ) +if (tags ==TAGS_SET ) { +struct refspec_item tag_refspec; +/* also fetch all tags */ -get_fetch_map (remote_refs, tag_refspec, &tail,0 ); -else if (tags ==TAGS_DEFAULT && *autotags) +refspec_item_init (&tag_refspec,TAG_REFSPEC ,0 ); +get_fetch_map (remote_refs, &tag_refspec, &tail,0 ); +refspec_item_clear (&tag_refspec); + }else if (tags ==TAGS_DEFAULT && *autotags) {find_non_local_tags (remote_refs,NULL , &ref_map, &tail); + }/* Now append any refs to be updated opportunistically: */ *tail = orefs;
refspec.c +0 -13
@@ -7,19 +7,6 @@#include "refspec.h" #include "strbuf.h" -static struct refspec_item s_tag_refspec = { - .force =0 , - .pattern =1 , - .matching =0 , - .exact_sha1 =0 , - .negative =0 , - .src ="refs/tags/*" , - .dst ="refs/tags/*" , -}; - -/* See TAG_REFSPEC for the string version */ -const struct refspec_item *tag_refspec = &s_tag_refspec; -/* * Parses the provided refspec 'refspec' and populates the refspec_item 'item'. * Returns 1 if successful and 0 if the refspec is invalid.
refspec.h +0 -1
@@ -2,7 +2,6 @@#define REFSPEC_H #define TAG_REFSPEC "refs/tags/*:refs/tags/*" -extern const struct refspec_item *tag_refspec; /** * A struct refspec_item holds the parsed interpretation of a refspec. If it
Signature · 1 line
2.45.1.410.g58bac47f8e.dirty
PATCH v4 6/27 builtin/remote: cast away constness in `get_head_names()`
In reply to Patrick SteinhardtIn get_head_names(), we assign the "refs/heads/*" string constant to struct refspec_item::{src,dst}, which are both non-constant pointers. Ideally, we'd refactor the code such that both of these fields were constant. But struct refspec_item is used for two different usecases with conflicting requirements:
- To query for a source or destination based on the given refspec. The caller either sets src or dst as the branch that we want to search for, and the respective other field gets populated. The fields should be constant when being used as a query parameter, which is owned by the caller, and non-constant when being used as an out parameter, which is owned by the refspec item. This is is contradictory in itself already.
- To store refspec items with their respective source and destination branches, in which case both fields should be owned by the struct.
Ideally, we'd split up this interface to clearly separate between querying and storing, which would enable us to clarify lifetimes of the strings. This would be a much bigger undertaking though.
Instead, accept the status quo for now and cast away the constness of the source and destination patterns. We know that those are not being written to or freed, so while this is ugly it certainly is fine for now.
--- builtin/remote.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
builtin/remote.c +6 -6
@@ -493,12 +493,13 @@ static int get_head_names(const struct ref *remote_refs, struct ref_states *stat {struct ref *ref, *matches;struct ref *fetch_map =NULL , **fetch_map_tail = &fetch_map; -struct refspec_item refspec; +struct refspec_item refspec = { + .force =0 , + .pattern =1 , + .src = (char *)"refs/heads/*" , + .dst = (char *)"refs/heads/*" , + }; -memset (&refspec,0 ,sizeof (refspec)); - refspec.force =0 ; - refspec.pattern =1 ; - refspec.src = refspec.dst ="refs/heads/*" ;get_fetch_map (remote_refs, &refspec, &fetch_map_tail,0 ); matches =guess_remote_head (find_ref_by_name (remote_refs,"HEAD" ), fetch_map,1 );
@@ -507,7 +508,6 @@ static int get_head_names(const struct ref *remote_refs, struct ref_states *statfree_refs (fetch_map);free_refs (matches); -return 0 ; }
Signature · 1 line
2.45.1.410.g58bac47f8e.dirty
PATCH v4 7/27 diff: cast string constant in `fill_textconv()`
In reply to Patrick SteinhardtThe fill_textconv() function is responsible for converting an input file with a textconv driver, which is then passed to the caller. Weirdly though, the function also handles the case where there is no textconv driver at all. In that case, it will return either the contents of the populated filespec, or an empty string if the filespec is invalid.
These two cases have differing memory ownership semantics. When there is a textconv driver, then the result is an allocated string. Otherwise, the result is either a string constant or owned by the filespec struct. All callers are in fact aware of this weirdness and only end up freeing the output buffer when they had a textconv driver.
Ideally, we'd split up this interface to only perform the conversion via the textconv driver, and BUG in case the caller didn't provide one. This would make memory ownership semantics much more straight forward. For now though, let's simply cast the empty string constant to char * to avoid a warning with -Wwrite-strings. This is equivalent to the same cast that we already have in fill_mmfile().
--- diff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff.c +1 -1
@@ -7235,7 +7235,7 @@ size_t fill_textconv(struct repository *r,if (!driver) {if (!DIFF_FILE_VALID (df)) { - *outbuf ="" ; + *outbuf = (char *)"" ;return 0 ; }if (diff_populate_filespec (r, df,NULL ))
Signature · 1 line
2.45.1.410.g58bac47f8e.dirty
PATCH v4 8/27 line-log: stop assigning string constant to file parent buffer
In reply to Patrick SteinhardtStop assigning a string constant to the file parent buffer and instead assign an allocated string. While the code is fine in practice, it will break once we compile with -Wwrite-strings.
--- line-log.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
line-log.c +3 -1
@@ -1032,6 +1032,7 @@ static int process_diff_filepair(struct rev_info *rev,struct range_set tmp;struct diff_ranges diff;mmfile_t file_parent, file_target; +char *parent_data_to_free =NULL ;assert (pair->two->path);while (rg) {
@@ -1056,7 +1057,7 @@ static int process_diff_filepair(struct rev_info *rev, file_parent.ptr = pair->one->data; file_parent.size = pair->one->size; }else { - file_parent.ptr ="" ; + file_parent.ptr = parent_data_to_free =xstrdup ("" ); file_parent.size =0 ; }
@@ -1075,6 +1076,7 @@ static int process_diff_filepair(struct rev_info *rev,diff_ranges_release (&diff); +free (parent_data_to_free);return ((*diff_out)->parent.nr >0 ); }
Signature · 1 line
2.45.1.410.g58bac47f8e.dirty
PATCH v4 9/27 line-log: always allocate the output prefix
In reply to Patrick SteinhardtThe returned string by output_prefix() is sometimes a string constant and sometimes an allocated string. This has been fine until now because we always leak the allocated strings, and thus we never tried to free the string constant.
Fix the code to always return an allocated string and free the returned value at all callsites.
--- line-log.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
line-log.c +11 -7
@@ -899,14 +899,12 @@ static void print_line(const char *prefix, char first,static char *output_prefix (struct diff_options *opt) { -char *prefix ="" ; -if (opt->output_prefix) {struct strbuf *sb = opt->output_prefix (opt, opt->output_prefix_data); - prefix = sb->buf; +return sb->buf; + }else { +return xstrdup ("" ); } - -return prefix; }static void dump_diff_hacky_one (struct rev_info *rev,struct line_log_data *range)
@@ -927,7 +925,7 @@ static void dump_diff_hacky_one(struct rev_info *rev, struct line_log_data *rangconst char *c_context =diff_get_color (opt->use_color,DIFF_CONTEXT );if (!pair || !diff) -return ; + goto out;if (pair->one->oid_valid)fill_line_ends (rev->diffopt.repo, pair->one, &p_lines, &p_ends);
@@ -1002,8 +1000,10 @@ static void dump_diff_hacky_one(struct rev_info *rev, struct line_log_data *rang c_context, c_reset, opt->file); } +out:free (p_ends);free (t_ends); +free (prefix); }/*
@@ -1012,7 +1012,11 @@ static void dump_diff_hacky_one(struct rev_info *rev, struct line_log_data *rang*/ static void dump_diff_hacky (struct rev_info *rev,struct line_log_data *range) { -fprintf (rev->diffopt.file,"%s\n" ,output_prefix (&rev->diffopt)); +char *prefix =output_prefix (&rev->diffopt); + +fprintf (rev->diffopt.file,"%s\n" , prefix); +free (prefix); +while (range) {dump_diff_hacky_one (rev, range); range = range->next;
Signature · 1 line
2.45.1.410.g58bac47f8e.dirty
PATCH v4 10/27 entry: refactor how we remove items for delayed checkouts
In reply to Patrick SteinhardtWhen finalizing a delayed checkout, we sort out several strings from the passed-in string list by first assigning the empty string to those filters and then calling string_list_remove_empty_items(). Assigning the empty string will cause compiler warnings though as the string is a char * once we enable -Wwrite-strings.
Refactor the code to use a NULL pointer with filter_string_list() instead to avoid this warning.
--- entry.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
entry.c +10 -4
@@ -167,6 +167,11 @@ static int remove_available_paths(struct string_list_item *item, void *cb_data)return !available; } +static int string_is_not_null(struct string_list_item *item, void *data UNUSED) +{ +return !!item->string; +} +int finish_delayed_checkout (struct checkout *state,int show_progress) {int errs =0 ;
@@ -189,7 +194,7 @@ int finish_delayed_checkout(struct checkout *state, int show_progress)if (!async_query_available_blobs (filter->string, &available_paths)) {/* Filter reported an error */ errs =1 ; - filter->string ="" ; + filter->string =NULL ;continue ; }if (available_paths.nr <=0 ) {
@@ -199,7 +204,7 @@ int finish_delayed_checkout(struct checkout *state, int show_progress)* filter from the list (see * "string_list_remove_empty_items" call below). */ - filter->string ="" ; + filter->string =NULL ;continue ; }
@@ -225,7 +230,7 @@ int finish_delayed_checkout(struct checkout *state, int show_progress)* Do not ask the filter for available blobs, * again, as the filter is likely buggy. */ - filter->string ="" ; + filter->string =NULL ;continue ; } ce = index_file_exists(state->istate, path->string,
@@ -239,7 +244,8 @@ int finish_delayed_checkout(struct checkout *state, int show_progress) errs =1 ; } } -string_list_remove_empty_items (&dco->filters,0 ); + +filter_string_list (&dco->filters,0 , string_is_not_null,NULL ); }stop_progress (&progress);string_list_clear (&dco->filters,0 );
Signature · 1 line
2.45.1.410.g58bac47f8e.dirty