ovn-test: Fix 'test-ovn composition' crash

Without this fix, the added test will core dump. Signed-off-by: Andy Zhou <[email protected]> Acked-by: Ben Pfaff <[email protected]>
water0615 · Oct 20, 2016 · 42d36b5 · 42d36b5
1 parent 2eb98b6
commit 42d36b5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/tests/ovn.at b/tests/ovn.at
@@ -175,6 +175,10 @@ ct_state = NXM_NX_CT_STATE
 ]])
 AT_CLEANUP
 
+AT_SETUP([ovn -- compsition])
+AT_CHECK([ovstest test-ovn composition 2], [0], [ignore])
+AT_CLEANUP
+
 AT_SETUP([ovn -- expression parser])
 dnl For lines without =>, input and expected output are identical.
 dnl For lines with =>, input precedes => and expected output follows =>.

diff --git a/tests/test-ovn.c b/tests/test-ovn.c
@@ -452,11 +452,11 @@ next_composition(unsigned int *state, int s[], int sn)
             j++;
         } else {
             j--;
-            s[j] = s[j + 1];
-            s[j - 1]++;
             if (!j) {
                 return 0;
             }
+            s[j] = s[j + 1];
+            s[j - 1]++;
         }
     }
     return j + 1;