Merged changes from HEAD

1 files changed, 5 insertions, 16 deletions

diff --git a/winsup/cygwin/debug.cc b/winsup/cygwin/debug.cc
index 280cbb44d16..418f35510b8 100644
--- a/winsup/cygwin/debug.cc
+++ b/winsup/cygwin/debug.cc
@@ -101,17 +101,9 @@ newh ()
 
   for (hl = cygheap->debug.freeh; hl < cygheap->debug.freeh + NFREEH; hl++)
     if (hl->name == NULL)
-      goto out;
-
-  /* All used up??? */
-  if ((hl = (handle_list *) malloc (sizeof *hl)) != NULL)
-    {
-      memset (hl, 0, sizeof (*hl));
-      hl->allocated = TRUE;
-    }
+      return hl;
 
-out:
-  return hl;
+  return NULL;
 }
 
 /* Add a handle to the linked list of known handles. */
@@ -136,8 +128,8 @@ add_handle (const char *func, int ln, HANDLE h, const char *name, bool inh)
   if ((hl = newh ()) == NULL)
     {
       here.unlock ();
-      system_printf ("couldn't allocate memory for %s(%d): %s(%p)",
-		     func, ln, name, h);
+      debug_printf ("couldn't allocate memory for %s(%d): %s(%p)",
+		    func, ln, name, h);
       return;
     }
   hl->h = h;
@@ -160,10 +152,7 @@ delete_handle (handle_list *hl)
   handle_list *hnuke = hl->next;
   debug_printf ("nuking handle '%s'", hnuke->name);
   hl->next = hl->next->next;
-  if (hnuke->allocated)
-    free (hnuke);
-  else
-    memset (hnuke, 0, sizeof (*hnuke));
+  memset (hnuke, 0, sizeof (*hnuke));
 }
 
 void