From: Samuel Thibault <samuel.thibault@gnu.org>
Date: Sun, 23 Nov 2014 15:19:46 +0000 (+0100)
Subject: [Hurd] Fix deallocation after proc_getprocinfo call
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a441dfbc4e339198cf9d27d21579fd04ff8c6e2c;p=binutils-gdb.git

[Hurd] Fix deallocation after proc_getprocinfo call

2014-11-24  Samuel Thibault  <samuel.thibault@ens-lyon.org>

	* gdb/gnu-nat.c (inf_validate_procinfo): Multiply the number of
	elements pi_len by the size of the elements before calling
	vm_deallocate.
	(inf_validate_task_sc): Likewise, and properly deallocate the
	noise array.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a5881bfbfc0..506dc613175 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2014-11-24  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+	Pushed by Joel Brobecker  <brobecker@adacore.com>
+	* gdb/gnu-nat.c (inf_validate_procinfo): Multiply the number of
+	elements pi_len by the size of the elements before calling
+	vm_deallocate.
+	(inf_validate_task_sc): Likewise, and properly deallocate the
+	noise array.
+
 2014-11-23  Doug Evans  <xdje42@gmail.com>
 
 	* gdbtypes.c (print_args): Renamed from print_arg_types.  Print arg
diff --git a/gdb/gnu-nat.c b/gdb/gnu-nat.c
index d17a7503c60..6dbf31ddec4 100644
--- a/gdb/gnu-nat.c
+++ b/gdb/gnu-nat.c
@@ -804,7 +804,8 @@ inf_validate_procinfo (struct inf *inf)
       inf->nomsg = !!(pi->state & PI_NOMSG);
       if (inf->nomsg)
 	inf->traced = !!(pi->state & PI_TRACED);
-      vm_deallocate (mach_task_self (), (vm_address_t) pi, pi_len);
+      vm_deallocate (mach_task_self (), (vm_address_t) pi,
+		     pi_len * sizeof (*(procinfo_t) 0));
       if (noise_len > 0)
 	vm_deallocate (mach_task_self (), (vm_address_t) noise, noise_len);
     }
@@ -844,9 +845,10 @@ inf_validate_task_sc (struct inf *inf)
 
   suspend_count = pi->taskinfo.suspend_count;
 
-  vm_deallocate (mach_task_self (), (vm_address_t) pi, pi_len);
+  vm_deallocate (mach_task_self (), (vm_address_t) pi,
+		 pi_len * sizeof (*(procinfo_t) 0));
   if (noise_len > 0)
-    vm_deallocate (mach_task_self (), (vm_address_t) pi, pi_len);
+    vm_deallocate (mach_task_self (), (vm_address_t) noise, noise_len);
 
   if (inf->task->cur_sc < suspend_count)
     {