ipsec-93.10.tar.gz

[apple/ipsec.git] / ipsec-tools / libipsec / policy_parse.y

diff --git a/ipsec-tools/libipsec/policy_parse.y b/ipsec-tools/libipsec/policy_parse.y
index 51fb1159180c0ef790904ababd556e5508677263..74d1e354d49a9079af8f6a1fb9189a9c82e4735f 100644 (file)
--- a/ipsec-tools/libipsec/policy_parse.y
+++ b/ipsec-tools/libipsec/policy_parse.y
@@ -400,26 +400,30 @@ parse_sockaddr(addrbuf, portbuf)
        char *serv = NULL;
        int error;
        struct sockaddr *newaddr = NULL;
+       int addr_len;
+       int serv_len;
 
-       if ((addr = malloc(addrbuf->len + 1)) == NULL) {
+       addr_len = addrbuf->len + 1;
+       if ((addr = malloc(addr_len)) == NULL) {
                yyerror("malloc failed");
                __ipsec_set_strerror(strerror(errno));
                return NULL;
        }
-
-       if (portbuf && ((serv = malloc(portbuf->len + 1)) == NULL)) {
-               free(addr);
-               yyerror("malloc failed");
-               __ipsec_set_strerror(strerror(errno));
-               return NULL;
+       
+       if (portbuf) {
+               serv_len = portbuf->len + 1;
+               if ((serv = malloc(serv_len)) == NULL) {
+                       free(addr);
+                       yyerror("malloc failed");
+                       __ipsec_set_strerror(strerror(errno));
+                       return NULL;
+               }
        }
 
-       strncpy(addr, addrbuf->buf, addrbuf->len);
-       addr[addrbuf->len] = '\0';
+       strlcpy(addr, addrbuf->buf, addr_len);
 
        if (portbuf) {
-               strncpy(serv, portbuf->buf, portbuf->len);
-               serv[portbuf->len] = '\0';
+               strlcpy(serv, portbuf->buf, serv_len);
        }
 
        memset(&hints, 0, sizeof(hints));