diff options
| author | Philippe Mathieu-Daudé <philmd@redhat.com> | 2020-07-23 19:12:05 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2020-07-24 15:03:09 +0200 |
| commit | 192cf54ac5408d21c20c17b3794a632970bbb880 (patch) | |
| tree | b0fd8e7b8267ef07da6f0c88e007d2523de34519 | |
| parent | 838886378eac879771708100a08a1099173d6935 (diff) | |
| download | qemu-192cf54ac5408d21c20c17b3794a632970bbb880.zip qemu-192cf54ac5408d21c20c17b3794a632970bbb880.tar.gz qemu-192cf54ac5408d21c20c17b3794a632970bbb880.tar.bz2 | |
qapi/error: Check format string argument in error_*prepend()
error_propagate_prepend() "behaves like error_prepend()", and
error_prepend() uses "formatting @fmt, ... like printf()".
error_prepend() checks its format string argument, but
error_propagate_prepend() does not. Fix by addint the format
attribute to error_propagate_prepend() and error_vprepend().
This would have caught the bug fixed in the previous commit.
Missed in commit 4b5766488f "error: Fix use of error_prepend() with
&error_fatal, &error_abort".
Inspired-by: Stefan Weil <sw@weilnetz.de>
Suggested-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Stefan Weil <sw@weilnetz.de>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200723171205.14949-1-philmd@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Commit message tweaked]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
| -rw-r--r-- | include/qapi/error.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/qapi/error.h b/include/qapi/error.h index 7932594..eaa05c4 100644 --- a/include/qapi/error.h +++ b/include/qapi/error.h @@ -382,13 +382,15 @@ void error_propagate(Error **dst_errp, Error *local_err); * Please use ERRP_GUARD() and error_prepend() instead when possible. */ void error_propagate_prepend(Error **dst_errp, Error *local_err, - const char *fmt, ...); + const char *fmt, ...) + GCC_FMT_ATTR(3, 4); /* * Prepend some text to @errp's human-readable error message. * The text is made by formatting @fmt, @ap like vprintf(). */ -void error_vprepend(Error *const *errp, const char *fmt, va_list ap); +void error_vprepend(Error *const *errp, const char *fmt, va_list ap) + GCC_FMT_ATTR(2, 0); /* * Prepend some text to @errp's human-readable error message. |