Changeset 988 for vendor/current/lib/replace/getifaddrs.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/lib/replace/getifaddrs.c (modified) (4 diffs)

vendor/current/lib/replace/getifaddrs.c

@@ -23 +23 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
-
-#define SOCKET_WRAPPER_NOT_REPLACE
 
 #include "replace.h"
@@ -114 +112 @@
                 if (ioctl(fd, SIOCGIFFLAGS, &ifr[i]) == -1) {
                         freeifaddrs(*ifap);
+                        close(fd);
                         return -1;
                 }
 
                 curif = calloc(1, sizeof(struct ifaddrs));
+                if (curif == NULL) {
+                        freeifaddrs(*ifap);
+                        close(fd);
+                        return -1;
+                }
                 curif->ifa_name = strdup(ifr[i].ifr_name);
+                if (curif->ifa_name == NULL) {
+                        free(curif);
+                        freeifaddrs(*ifap);
+                        close(fd);
+                        return -1;
+                }
                 curif->ifa_flags = ifr[i].ifr_flags;
                 curif->ifa_dstaddr = NULL;
@@ -127 +137 @@
                 if (ioctl(fd, SIOCGIFADDR, &ifr[i]) != -1) {
                         curif->ifa_addr = sockaddr_dup(&ifr[i].ifr_addr);
+                        if (curif->ifa_addr == NULL) {
+                                free(curif->ifa_name);
+                                free(curif);
+                                freeifaddrs(*ifap);
+                                close(fd);
+                                return -1;
+                        }
                 }
 
@@ -132 +149 @@
                 if (ioctl(fd, SIOCGIFNETMASK, &ifr[i]) != -1) {
                         curif->ifa_netmask = sockaddr_dup(&ifr[i].ifr_addr);
+                        if (curif->ifa_netmask == NULL) {
+                                if (curif->ifa_addr != NULL) {
+                                        free(curif->ifa_addr);
+                                }
+                                free(curif->ifa_name);
+                                free(curif);
+                                freeifaddrs(*ifap);
+                                close(fd);
+                                return -1;
+                        }
                 }