From: Ben Pfaff <blp@nicira.com>
Date: Wed, 9 May 2012 19:21:54 +0000 (-0700)
Subject: odp-util: Fix parsing of actions encapsulated within "sample" actions.
X-Git-Tag: sliver-openvswitch-1.8.90-0~48^2~450
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=79d4ffe2c977c9750b77f869be185b5bedd08c2d;p=sliver-openvswitch.git

odp-util: Fix parsing of actions encapsulated within "sample" actions.

Signed-off-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/lib/odp-util.c b/lib/odp-util.c
index 88986a2ea..ce4563536 100644
--- a/lib/odp-util.c
+++ b/lib/odp-util.c
@@ -534,7 +534,7 @@ parse_odp_action(const char *s, const struct shash *port_names,
             for (;;) {
                 int retval;
 
-                s += strspn(s, delimiters);
+                n += strspn(s + n, delimiters);
                 if (s[n] == ')') {
                     break;
                 }
@@ -544,7 +544,6 @@ parse_odp_action(const char *s, const struct shash *port_names,
                     return retval;
                 }
                 n += retval;
-
             }
             nl_msg_end_nested(actions, actions_ofs);
             nl_msg_end_nested(actions, sample_ofs);