From: Doug Evans <dje@google.com>
Date: Tue, 20 Dec 2011 04:46:27 +0000 (+0000)
Subject: 	* python/py-auto-load.c (info_auto_load_scripts): Pass address of
X-Git-Tag: gdb_7_4-2012-01-24-release~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f58214b04e43d96e906e95924898ab92b8b601ab;p=thirdparty%2Fbinutils-gdb.git

	* python/py-auto-load.c (info_auto_load_scripts): Pass address of
	scripts vector to collect_matching_scripts.
	(collect_matching_scripts): Update.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 98f778989e3..a2dc9ca9bad 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2011-12-19  Doug Evans  <dje@google.com>
+
+	* python/py-auto-load.c (info_auto_load_scripts): Pass address of
+	scripts vector to collect_matching_scripts.
+	(collect_matching_scripts): Update.
+
 2011-12-19  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	* symfile.c (reread_symbols): Move free_objfile_separate_debug,
diff --git a/gdb/python/py-auto-load.c b/gdb/python/py-auto-load.c
index 62975ea10df..ef332ea8a1a 100644
--- a/gdb/python/py-auto-load.c
+++ b/gdb/python/py-auto-load.c
@@ -481,10 +481,10 @@ static int
 collect_matching_scripts (void **slot, void *info)
 {
   struct loaded_script *script = *slot;
-  VEC (loaded_script_ptr) *scripts = info;
+  VEC (loaded_script_ptr) **scripts_ptr = info;
 
   if (re_exec (script->name))
-    VEC_safe_push (loaded_script_ptr, scripts, script);
+    VEC_safe_push (loaded_script_ptr, *scripts_ptr, script);
 
   return 1;
 }
@@ -563,8 +563,9 @@ info_auto_load_scripts (char *pattern, int from_tty)
   if (pspace_info != NULL && pspace_info->loaded_scripts != NULL)
     {
       immediate_quit++;
+      /* Pass a pointer to scripts as VEC_safe_push can realloc space.  */
       htab_traverse_noresize (pspace_info->loaded_scripts,
-			      collect_matching_scripts, scripts);
+			      collect_matching_scripts, &scripts);
       immediate_quit--;
     }