Changeset ff381a7 in mainline for uspace/lib/c/generic/inet/addr.c

Timestamp:

2015-11-02T20:54:19Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/lib/c/generic/inet/addr.c (modified) (2 diffs)

uspace/lib/c/generic/inet/addr.c

@@ -306 +306 @@
                 i++;
 
-                if (*cur == '\0')
+                if (*cur == '\0' || *cur == '/')
                         break;
 
@@ -317 +317 @@
 
         if (prefix != NULL) {
+                if (*cur != '/')
+                        return EINVAL;
+                cur++;
+
                 *prefix = strtoul(cur, &cur, 10);
                 if (*prefix > 32)