# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1422532873 -3600
# Node ID 0ef4ad6ff5da35cb0ef81bc1dfab514a6aebc85a
# Parent  18a6783e147fbe74c90a7fe9d82b83ec53662e3b
glibc: CVE-2015-0235 fix (again)

diff -r 18a6783e147f -r 0ef4ad6ff5da glibc/stuff/glibc-2.13-CVE-2015-0235.patch
--- a/glibc/stuff/glibc-2.13-CVE-2015-0235.patch	Thu Jan 29 11:47:30 2015 +0100
+++ b/glibc/stuff/glibc-2.13-CVE-2015-0235.patch	Thu Jan 29 13:01:13 2015 +0100
@@ -14,15 +14,7 @@
        return -1;
      }
  
-@@ -84,14 +87,16 @@
- 	}
- 
-       size_needed = (sizeof (*host_addr)
--		     + sizeof (*h_addr_ptrs) + strlen (name) + 1);
-+		     + sizeof (*h_addr_ptrs)
-+		     + sizeof (*h_allias_ptr) + strlen (name) + 1);
- 
-       if (buffer_size == NULL)
+@@ -90,8 +93,9 @@
          {
  	  if (buflen < size_needed)
  	    {
@@ -33,7 +25,7 @@
  	      __set_errno (ERANGE);
  	      goto done;
  	    }
-@@ -110,7 +115,7 @@
+@@ -110,7 +114,7 @@
  	      *buffer_size = 0;
  	      __set_errno (save);
  	      if (h_errnop != NULL)
@@ -42,7 +34,7 @@
  	      *result = NULL;
  	      goto done;
  	    }
-@@ -150,7 +155,9 @@
+@@ -150,7 +154,9 @@
  		  if (! ok)
  		    {
  		      *h_errnop = HOST_NOT_FOUND;
@@ -53,7 +45,7 @@
  			*result = NULL;
  		      goto done;
  		    }
-@@ -202,15 +209,6 @@
+@@ -202,15 +208,6 @@
  
        if ((isxdigit (name[0]) && strchr (name, ':') != NULL) || name[0] == ':')
  	{
@@ -69,7 +61,7 @@
  	  switch (af)
  	    {
  	    default:
-@@ -226,7 +224,10 @@
+@@ -226,7 +223,10 @@
  	      /* This is not possible.  We cannot represent an IPv6 address
  		 in an `struct in_addr' variable.  */
  	      *h_errnop = HOST_NOT_FOUND;
@@ -81,7 +73,7 @@
  	      goto done;
  
  	    case AF_INET6:
-@@ -234,42 +235,6 @@
+@@ -234,42 +234,6 @@
  	      break;
  	    }
  
@@ -124,7 +116,7 @@
  	  for (cp = name;; ++cp)
  	    {
  	      if (!*cp)
-@@ -282,7 +247,9 @@
+@@ -282,7 +246,9 @@
  		  if (inet_pton (AF_INET6, name, host_addr) <= 0)
  		    {
  		      *h_errnop = HOST_NOT_FOUND;