From 0219d6ac270de23b7c0ad01521cb27ebe767701d Mon Sep 17 00:00:00 2001
From: Gerhard Rieger <gerhard@dest-unreach.org>
Date: Mon, 12 Jan 2015 21:57:51 +0100
Subject: [PATCH] Fixed return value of nestlex()

---
 CHANGES   |  2 ++
 xioopts.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++---------
 2 files changed, 53 insertions(+), 10 deletions(-)

diff --git a/CHANGES b/CHANGES
index acaeaee..9f0eae6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -23,6 +23,8 @@ corrections:
 	Test: ABSTRACT_BIND
 	Thanks to Denis Shatov for reporting this bug.
 
+	Fixed return value of nestlex()
+
 ####################### V 1.7.2.4:
 
 corrections:
diff --git a/xioopts.c b/xioopts.c
index 26c2f41..1cbf508 100644
--- a/xioopts.c
+++ b/xioopts.c
@@ -1826,7 +1826,11 @@ int parseopts_table(const char **a, unsigned int groups, struct opt **opts,
       parsres =
 	 nestlex(a, &tokp, &len, endkey, hquotes, squotes, nests,
 		 true, true, false);
-      if (parsres != 0) {
+      if (parsres < 0) {
+	 Error1("option too long:  \"%s\"", *a);
+	 return -1;
+      } else if (parsres > 0) {
+	 Error1("syntax error in \"%s\"", *a);
 	 return -1;
       }
       if (tokp == token) {
@@ -1861,7 +1865,11 @@ int parseopts_table(const char **a, unsigned int groups, struct opt **opts,
 	 parsres =
 	    nestlex(a, &tokp, &len, endval, hquotes, squotes, nests,
 		    true, true, false);
-	 if (parsres != 0) {
+	 if (parsres < 0) {
+	    Error1("option too long:  \"%s\"", *a);
+	    return -1;
+	 } else if (parsres > 0) {
+	    Error1("syntax error in \"%s\"", *a);
 	    return -1;
 	 }
 	 *tokp = '\0';
@@ -2339,9 +2347,17 @@ int parseopts_table(const char **a, unsigned int groups, struct opt **opts,
 	    /* parse first IP address, expect ':' */
 	    tokp = token;
 	    /*! result= */
-	    nestlex((const char **)&tokp, &buffp, &bufspc,
-		    ends, NULL, NULL, nests,
-		    true, false, false);
+	    parsres =
+	       nestlex((const char **)&tokp, &buffp, &bufspc,
+		       ends, NULL, NULL, nests,
+		       true, false, false);
+	    if (parsres < 0) {
+	       Error1("option too long:  \"%s\"", *a);
+	       return -1;
+	    } else if (parsres > 0) {
+	       Error1("syntax error in \"%s\"", *a);
+	       return -1;
+	    }
 	    if (*tokp != ':') {
 	       Error1("syntax in option %s: missing ':'", token);
 	    }
@@ -2352,9 +2368,17 @@ int parseopts_table(const char **a, unsigned int groups, struct opt **opts,
 	    /* parse second IP address, expect ':' or '\0'' */
 	    buffp = buff;
 	    /*! result= */
-	    nestlex((const char **)&tokp, &buffp, &bufspc,
-		    ends, NULL, NULL, nests,
-		    true, false, false);
+	    parsres =
+	       nestlex((const char **)&tokp, &buffp, &bufspc,
+		       ends, NULL, NULL, nests,
+		       true, false, false);
+	    if (parsres < 0) {
+	       Error1("option too long:  \"%s\"", *a);
+	       return -1;
+	    } else if (parsres > 0) {
+	       Error1("syntax error in \"%s\"", *a);
+	       return -1;
+	    }
 	    *buffp++ = '\0';
 	    (*opts)[i].value.u_ip_mreq.param2 = strdup(buff); /*!!! NULL */
 
@@ -2392,9 +2416,17 @@ int parseopts_table(const char **a, unsigned int groups, struct opt **opts,
 	    char buff[512], *buffp=buff; size_t bufspc = sizeof(buff)-1;
 
 	    tokp = token;
+	    parsres =
 	    nestlex((const char **)&tokp, &buffp, &bufspc,
 		    ends, NULL, NULL, nests,
 		    true, false, false);
+	    if (parsres < 0) {
+	       Error1("option too long:  \"%s\"", *a);
+	       return -1;
+	    } else if (parsres > 0) {
+	       Error1("syntax error in \"%s\"", *a);
+	       return -1;
+	    }
 	    if (*tokp != '\0') {
 	       Error1("trailing data in option \"%s\"", token);
 	    }
@@ -2841,6 +2873,7 @@ int retropt_bind(struct opt *opts,
    char *bindname, *bindp;
    char hostname[512], *hostp = hostname, *portp = NULL;
    size_t hostlen = sizeof(hostname)-1;
+   int parsres;
    int result;
 
    if (retropt_string(opts, OPT_BIND, &bindname) < 0) {
@@ -2874,8 +2907,16 @@ int retropt_bind(struct opt *opts,
    case AF_INET6:
 #endif /*WITH_IP6 */
       portallowed = (feats>=2);
-      nestlex((const char **)&bindp, &hostp, &hostlen, ends, NULL, NULL, nests,
-	      true, false, false);
+      parsres =
+	 nestlex((const char **)&bindp, &hostp, &hostlen, ends, NULL, NULL, nests,
+		 true, false, false);
+      if (parsres < 0) {
+	 Error1("option too long:  \"%s\"", bindp);
+	 return STAT_NORETRY;
+      } else if (parsres > 0) {
+	 Error1("syntax error in \"%s\"", bindp);
+	 return STAT_NORETRY;
+      }
       *hostp++ = '\0';
       if (!strncmp(bindp, portsep, strlen(portsep))) {
 	 if (!portallowed) {