* sol-thread.c (restore_inferior_pid): Save the PID in a freshly

allocated buffer.
(save_inferior_pid): Restore the PID from that tempoary
buffer. Delete the buffer.
* utils.c (make_cleanup_close, do_close_cleanup): Ditto for FD.

1 files changed, 7 insertions, 3 deletions

diff --git a/gdb/sol-thread.c b/gdb/sol-thread.c
index f7727b483d8..f266902f78e 100644
--- a/gdb/sol-thread.c
+++ b/gdb/sol-thread.c
@@ -424,13 +424,17 @@ lwp_to_thread (int lwp)
 static struct cleanup *
 save_inferior_pid (void)
 {
-  return make_cleanup (restore_inferior_pid, (void *) inferior_pid);
+  int *saved_pid = xmalloc (sizeof (int));
+  *saved_pid = inferior_pid;
+  return make_cleanup (restore_inferior_pid, saved_pid);
 }
 
 static void
-restore_inferior_pid (void *pid)
+restore_inferior_pid (void *data)
 {
-  inferior_pid = (int) pid;
+  int *saved_pid = data;
+  inferior_pid = *saved_pid;
+  xfree (saved_pid);
 }