From Ulrich Weigand:

* utils.c (query): Do not use a va_list variable multiple times.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cf32cf60230278a03084ea4569e7aa069eb1d872..f45dc68ec984f628ac12c211793266334a6c38fd 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-30  Jim Blandy  <jimb@redhat.com>
+
+       From Ulrich Weigand:
+       * utils.c (query): Do not use a va_list variable multiple times.
+
 2004-03-29  Daniel Jacobowitz  <drow@mvista.com>
 
        * Makefile.in (linux_nat_h): Update dependencies.

diff --git a/gdb/utils.c b/gdb/utils.c
index 3bc5fed2a30791027b57a480dc240f6a32c281c0..a5b28c1258fb25c8198fd0dce3fa041e466ab8aa 100644 (file)
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -1270,10 +1270,9 @@ query (const char *ctlstr, ...)
   int ans2;
   int retval;
 
-  va_start (args, ctlstr);
-
   if (query_hook)
     {
+      va_start (args, ctlstr);
       return query_hook (ctlstr, args);
     }
 
@@ -1289,7 +1288,9 @@ query (const char *ctlstr, ...)
       if (annotation_level > 1)
        printf_filtered ("\n\032\032pre-query\n");
 
+      va_start (args, ctlstr);
       vfprintf_filtered (gdb_stdout, ctlstr, args);
+      va_end (args);
       printf_filtered ("(y or n) ");
 
       if (annotation_level > 1)