From 82e39fc45f3a42a19c8037bcba88107b51a388cb Mon Sep 17 00:00:00 2001
From: Guy Harris <guy@alum.mit.edu>
Date: Thu, 28 Apr 2016 14:53:11 -0700
Subject: [PATCH] Don't mix g_malloc() and wmem_alloc().

Always allocate sub_net_hashipv4 structures with wmem.

Bug: 12386
Change-Id: Ibc4f09c267a2e651d9120ef67d4d5b77635172d6
Reviewed-on: https://code.wireshark.org/review/15152
Reviewed-by: Guy Harris <guy@alum.mit.edu>
---
 epan/addr_resolv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c
index 06c3ac1601..2d003a70f2 100644
--- a/epan/addr_resolv.c
+++ b/epan/addr_resolv.c
@@ -2304,7 +2304,7 @@ subnet_entry_set(guint32 subnet_addr, const guint32 mask_length, const gchar* na
             }
         }
 
-        new_tp = g_new(sub_net_hashipv4_t, 1);
+        new_tp = wmem_new(wmem_epan_scope(), sub_net_hashipv4_t);
         tp->next = new_tp;
         tp = new_tp;
     } else {