diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-03-09 21:21:21 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-03-09 21:21:21 +0300 |
| commit | 6125104b88e8bb0539b5d8a43bd0788922402724 (patch) | |
| tree | b6e8fa3cf520864a1044945b21b05c838a35abe1 | |
| parent | 1ac37deba2608490642432f16a82c95c0abf01fa (diff) | |
| parent | 7329d94be72654f7f211e1bfa5ce3dd6fd2dc1fa (diff) | |
Merge branch 'rt/format-zero-length-fix'
Recently we inadvertently added a few instances of using 0-width
format string to functions that we mark as printf-like without any
developers noticing. The root cause was that the compiler warning
that is triggered by this is almost always useless and we disabled
the warning in our developer builds, but not for general public.
The new instances have been corrected, and the warning has been
resurrected in the developer builds.
* rt/format-zero-length-fix:
config.mak.dev: re-enable -Wformat-zero-length
rebase-interactive.c: silence format-zero-length warnings
| -rw-r--r-- | config.mak.dev | 1 | ||||
| -rw-r--r-- | rebase-interactive.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/config.mak.dev b/config.mak.dev index bf1f3fcdee..89b218d11a 100644 --- a/config.mak.dev +++ b/config.mak.dev @@ -9,7 +9,6 @@ endif DEVELOPER_CFLAGS += -Wall DEVELOPER_CFLAGS += -Wdeclaration-after-statement DEVELOPER_CFLAGS += -Wformat-security -DEVELOPER_CFLAGS += -Wno-format-zero-length DEVELOPER_CFLAGS += -Wold-style-definition DEVELOPER_CFLAGS += -Woverflow DEVELOPER_CFLAGS += -Wpointer-arith diff --git a/rebase-interactive.c b/rebase-interactive.c index d86b434b3d..762853bc7e 100644 --- a/rebase-interactive.c +++ b/rebase-interactive.c @@ -129,14 +129,14 @@ int edit_todo_list(struct repository *r, struct todo_list *todo_list, if (incorrect) { if (todo_list_check_against_backup(r, new_todo)) { - write_file(rebase_path_dropped(), ""); + write_file(rebase_path_dropped(), "%s", ""); return -4; } if (incorrect > 0) unlink(rebase_path_dropped()); } else if (todo_list_check(todo_list, new_todo)) { - write_file(rebase_path_dropped(), ""); + write_file(rebase_path_dropped(), "%s", ""); return -4; } |