svn commit: r405491 - in head/dns/dnsmasq: . files

[Matthias Andree]

Author: mandree
Date: Thu Jan  7 23:44:00 2016
New Revision: 405491
URL: https://svnweb.freebsd.org/changeset/ports/405491

Log:
  Cherry-pick two upstream fixes for crashers.
  
  (But bump PORTREVISION instead of PORTEPOCH ;-))
  
  http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=0007ee90646a5a78a96ee729932e89d31c69513a
  http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=41a8d9e99be9f2cc8b02051dd322cb45e0faac87
  
  Submitted by:	garga@
  Obtained from:	Edwin Török, Simon Kelley
  Differential Revision:	D4813

Added:
  head/dns/dnsmasq/files/patch-src_cache.c   (contents, props changed)
  head/dns/dnsmasq/files/patch-src_option.c   (contents, props changed)
Modified:
  head/dns/dnsmasq/Makefile

Modified: head/dns/dnsmasq/Makefile
==============================================================================
--- head/dns/dnsmasq/Makefile	Thu Jan  7 23:20:46 2016	(r405490)
+++ head/dns/dnsmasq/Makefile	Thu Jan  7 23:44:00 2016	(r405491)
@@ -3,6 +3,7 @@
 
 PORTNAME=	dnsmasq
 DISTVERSION=	2.75
+PORTREVISION=	1	# leave this in even if 0 to avoid PORTEPOCH bumps
 PORTEPOCH=	1
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://www.thekelleys.org.uk/dnsmasq/ \

Added: head/dns/dnsmasq/files/patch-src_cache.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/dns/dnsmasq/files/patch-src_cache.c	Thu Jan  7 23:44:00 2016	(r405491)
@@ -0,0 +1,11 @@
+--- src/cache.c.orig	2015-07-30 19:59:07 UTC
++++ src/cache.c
+@@ -481,7 +481,7 @@ struct crec *cache_insert(char *name, st
+ 	 existing record is for an A or AAAA and
+ 	 the record we're trying to insert is the same, 
+ 	 just drop the insert, but don't error the whole process. */
+-      if ((flags & (F_IPV4 | F_IPV6)) && (flags & F_FORWARD))
++      if ((flags & (F_IPV4 | F_IPV6)) && (flags & F_FORWARD) && addr)
+ 	{
+ 	  if ((flags & F_IPV4) && (new->flags & F_IPV4) &&
+ 	      new->addr.addr.addr.addr4.s_addr == addr->addr.addr4.s_addr)

Added: head/dns/dnsmasq/files/patch-src_option.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/dns/dnsmasq/files/patch-src_option.c	Thu Jan  7 23:44:00 2016	(r405491)
@@ -0,0 +1,23 @@
+--- src/option.c.orig	2015-07-30 19:59:07 UTC
++++ src/option.c
+@@ -1501,10 +1501,16 @@ static int one_opt(int option, char *arg
+ 		li = opt_malloc(sizeof(struct list));
+ 		if (*arg == '*')
+ 		  {
+-		    li->next = match_suffix;
+-		    match_suffix = li;
+-		    /* Have to copy: buffer is overwritten */
+-		    li->suffix = opt_string_alloc(arg+1);
++		    /* "*" with no suffix is a no-op */
++		    if (arg[1] == 0)
++		      free(li);
++		    else
++		      {
++			li->next = match_suffix;
++			match_suffix = li;
++			/* Have to copy: buffer is overwritten */
++			li->suffix = opt_string_alloc(arg+1);
++		      }
+ 		  }
+ 		else
+ 		  {