components/git/patches/inet_ntop.patch
author John Ojemann <john.ojemann@oracle.com>
Tue, 24 Jan 2017 04:39:14 -0800
branchs11u3-sru
changeset 7597 21897c6862f7
parent 5720 519e1bb835ee
permissions -rw-r--r--
25366898 pcsclite SCardReleaseContext can result in a double-free of the "cardsList"
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5720
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     1
This patch was developed in-house and is planned to be contributed upstream
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     2
(it is still needed for version 2.6.1).
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     3
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     4
--- git-1.7.9.2/git-compat-util.h.~1~	2015-09-24 16:14:32.844686777 -0700
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     5
+++ git-1.7.9.2/git-compat-util.h	2015-09-24 16:13:05.181990467 -0700
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     6
@@ -418,7 +418,7 @@
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     7
 #endif
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     8
 
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     9
 #ifdef NO_INET_NTOP
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    10
-const char *inet_ntop(int af, const void *src, char *dst, size_t size);
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    11
+const char *inet_ntop(int af, const void *src, char *dst, socklen_t size);
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    12
 #endif
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    13
 
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    14
 extern void release_pack_memory(size_t, int);
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    15
--- git-1.7.9.2/compat/inet_ntop.c.~1~	2015-09-24 16:16:58.256287899 -0700
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    16
+++ git-1.7.9.2/compat/inet_ntop.c	2015-09-24 16:17:19.386385899 -0700
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    17
@@ -168,7 +168,7 @@
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    18
  *	Paul Vixie, 1996.
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    19
  */
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    20
 const char *
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    21
-inet_ntop(int af, const void *src, char *dst, size_t size)
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    22
+inet_ntop(int af, const void *src, char *dst, socklen_t size)
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    23
 {
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    24
 	switch (af) {
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    25
 	case AF_INET: