Added VERIFY_ALL_TALLOC

Which walks over the entire talloc'd tree, and does nothing else.
The idea is that if something (i.e. us) over-writes the talloc
headers, then this function will catch it.

src/include/libradius.h

@@ -619,6 +619,19 @@ int fr_sockaddr2ipaddr(struct sockaddr_storage const *sa, socklen_t salen,
 		       fr_ipaddr_t *ipaddr, int * port);
 ssize_t fr_utf8_to_ucs2(uint8_t *out, size_t outlen, char const *in, size_t inlen);
 
+/*
+ *	Define TALLOC_DEBUG to check overflows with talloc.
+ *	we can't use valgrind, because the memory used by
+ *	talloc is valid memory... just not for us.
+ */
+#ifdef TALLOC_DEBUG
+void fr_talloc_verify_cb(const void *ptr, int depth,
+			 int max_depth, int is_ref,
+			 void *private_data);
+#define VERIFY_ALL_TALLOC talloc_report_depth_cb(NULL, 0, -1, fr_talloc_verify_cb, NULL)
+#else
+#define VERIFY_ALL_TALLOC
+#endif
 
 #ifdef WITH_ASCEND_BINARY
 /* filters.c */

src/lib/misc.c

@@ -503,6 +503,21 @@ int ip_hton(char const *src, int af, fr_ipaddr_t *dst)
 	memset(&hints, 0, sizeof(hints));
 	hints.ai_family = af;
 
+#ifdef TALLOC_DEBUG
+	/*
+	 *	Avoid malloc for IP addresses.  This helps us debug
+	 *	memory errors when using talloc.
+	 */
+	if (af == AF_INET) {
+		/*
+		 *	If it's all numeric, avoid getaddrinfo()
+		 */
+		if (inet_pton(af, src, &dst->ipaddr.ip4addr) == 1) {
+			return 0;
+		}
+	}
+#endif
+
 	if ((rcode = getaddrinfo(src, NULL, &hints, &res)) != 0) {
 		fr_strerror_printf("ip_hton: %s", gai_strerror(rcode));
 		return -1;
@@ -802,3 +817,11 @@ ssize_t fr_utf8_to_ucs2(uint8_t *out, size_t outlen, char const *in, size_t inle
 	return out - start;
 }
 
+#ifdef TALLOC_DEBUG
+void fr_talloc_verify_cb(UNUSED const void *ptr, UNUSED int depth,
+			 UNUSED int max_depth, UNUSED int is_ref,
+			 UNUSED void *private_data)
+{
+	/* do nothing */
+}
+#endif

src/lib/valuepair.c

@@ -80,6 +80,9 @@ static int _pairfree(VALUE_PAIR *vp) {
 	vp->vp_integer = FREE_MAGIC;
 #endif
 
+#ifdef TALLOC_DEBUG
+	talloc_report_depth_cb(NULL, 0, -1, fr_talloc_verify_cb, NULL);
+#endif
 	return 0;
 }
 

src/main/util.c

@@ -189,7 +189,6 @@ void *request_data_reference(REQUEST *request,
 	return NULL;		/* wasn't found, too bad... */
 }
 
-
 /*
  *	Free a REQUEST struct.
  */
@@ -229,6 +228,8 @@ void request_free(REQUEST **request_ptr)
 #endif
 	talloc_free(request);
 	*request_ptr = NULL;
+
+	VERIFY_ALL_TALLOC;
 }
 
 /*