aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Marchi <simon.marchi@ericsson.com>2018-08-06 16:54:47 -0400
committerSimon Marchi <simon.marchi@ericsson.com>2018-08-06 16:57:24 -0400
commita7f25a84f4cc1df5248c46346337f19a2a66af5a (patch)
tree538a34ca4d53d12c4a8f50bd35f7d7f850fb0ba4
parentdc1f2887c513c4c2110d2d997ab33ce36b9696fc (diff)
downloadgdb-a7f25a84f4cc1df5248c46346337f19a2a66af5a.zip
gdb-a7f25a84f4cc1df5248c46346337f19a2a66af5a.tar.gz
gdb-a7f25a84f4cc1df5248c46346337f19a2a66af5a.tar.bz2
Fix compilation failure in remote.c
A recent patch introduced a few of these: /home/emaisin/src/binutils-gdb/gdb/remote.c:12862:19: error: format not a string literal and no format arguments [-Werror=format-security] error (err_msg); ^ Fix them by replacing the call to error with error ("%s", err_msg); gdb/ChangeLog: * remote.c (remote_target::download_tracepoint): Fix format string errors.
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/remote.c20
2 files changed, 15 insertions, 10 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 03badaf..8fc9cab 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2018-08-06 Simon Marchi <simon.marchi@ericsson.com>
+
+ * remote.c (remote_target::download_tracepoint): Fix format
+ string errors.
+
2018-08-06 Pedro Franco de Carvalho <pedromfc@linux.ibm.com>
* tracefile.c: Include common/byte-vector.h.
diff --git a/gdb/remote.c b/gdb/remote.c
index 4974c2e..33f6cd5 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -12859,7 +12859,7 @@ remote_target::download_tracepoint (struct bp_location *loc)
t->step_count, t->pass_count);
if (ret < 0 || ret >= buf.size ())
- error (err_msg);
+ error ("%s", err_msg);
/* Fast tracepoints are mostly handled by the target, but we can
tell the target how big of an instruction block should be moved
@@ -12879,7 +12879,7 @@ remote_target::download_tracepoint (struct bp_location *loc)
gdb_insn_length (loc->gdbarch, tpaddr));
if (ret < 0 || ret >= size_left)
- error (err_msg);
+ error ("%s", err_msg);
}
else
/* If it passed validation at definition but fails now,
@@ -12910,7 +12910,7 @@ remote_target::download_tracepoint (struct bp_location *loc)
size_left, ":S");
if (ret < 0 || ret >= size_left)
- error (err_msg);
+ error ("%s", err_msg);
}
else
error (_("Static tracepoint not valid during download"));
@@ -12938,14 +12938,14 @@ remote_target::download_tracepoint (struct bp_location *loc)
size_left, ":X%x,", aexpr->len);
if (ret < 0 || ret >= size_left)
- error (err_msg);
+ error ("%s", err_msg);
size_left = buf.size () - strlen (buf.data ());
/* Two bytes to encode each aexpr byte, plus the terminating
null byte. */
if (aexpr->len * 2 + 1 > size_left)
- error (err_msg);
+ error ("%s", err_msg);
pkt = buf.data () + strlen (buf.data ());
@@ -12966,7 +12966,7 @@ remote_target::download_tracepoint (struct bp_location *loc)
size_left, "-");
if (ret < 0 || ret >= size_left)
- error (err_msg);
+ error ("%s", err_msg);
}
putpkt (buf.data ());
@@ -12989,7 +12989,7 @@ remote_target::download_tracepoint (struct bp_location *loc)
has_more ? '-' : 0);
if (ret < 0 || ret >= buf.size ())
- error (err_msg);
+ error ("%s", err_msg);
putpkt (buf.data ());
remote_get_noisy_reply ();
@@ -13012,7 +13012,7 @@ remote_target::download_tracepoint (struct bp_location *loc)
has_more ? "-" : "");
if (ret < 0 || ret >= buf.size ())
- error (err_msg);
+ error ("%s", err_msg);
putpkt (buf.data ());
remote_get_noisy_reply ();
@@ -13027,7 +13027,7 @@ remote_target::download_tracepoint (struct bp_location *loc)
ret = snprintf (buf.data (), buf.size (), "QTDPsrc:");
if (ret < 0 || ret >= buf.size ())
- error (err_msg);
+ error ("%s", err_msg);
encode_source_string (b->number, loc->address, "at",
event_location_to_string (b->location.get ()),
@@ -13043,7 +13043,7 @@ remote_target::download_tracepoint (struct bp_location *loc)
ret = snprintf (buf.data (), buf.size (), "QTDPsrc:");
if (ret < 0 || ret >= buf.size ())
- error (err_msg);
+ error ("%s", err_msg);
encode_source_string (b->number, loc->address,
"cond", b->cond_string,