Changeset 4346

Timestamp:

01/31/07 11:10:53

Author:

gdt

Message:

free schmid_guard on error paths where it has been allocated and not
freed. Fixes shm leak on NetBSD which hits the error case for unknown
reasons.

Files:

• gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_vmcircbuf_sysv_shm.cc (modified) (2 diffs)

gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_vmcircbuf_sysv_shm.cc

@@ -69 +69 @@
-  if ((shmid2 = shmget (IPC_PRIVATE, 2 * size + 2 * pagesize, IPC_CREAT | 0700)) == -1){
-    perror ("gr_vmcircbuf_sysv_shm: shmget (1)");
+    shmctl (shmid_guard, IPC_RMID, 0);
-    throw std::runtime_error ("gr_vmcircbuf_sysv_shm");
-  }
@@ -74 +75 @@
-  if ((shmid1 = shmget (IPC_PRIVATE, size, IPC_CREAT | 0700)) == -1){
-    perror ("gr_vmcircbuf_sysv_shm: shmget (2)");
+    shmctl (shmid_guard, IPC_RMID, 0);
-    shmctl (shmid2, IPC_RMID, 0);
-    throw std::runtime_error ("gr_vmcircbuf_sysv_shm");