chunk: Skip all leading zero bytes in chunk_skip_zero() not just the first

diff --git a/src/libstrongswan/tests/suites/test_chunk.c b/src/libstrongswan/tests/suites/test_chunk.c
index 7e5310c64efdedb136d1d1a001fe155705309aa3..b82b1436f52c1971f5751d685843661f0e421ca5 100644 (file)
--- a/src/libstrongswan/tests/suites/test_chunk.c
+++ b/src/libstrongswan/tests/suites/test_chunk.c
@@ -316,11 +316,11 @@ START_TEST(test_chunk_skip)
        foobar = chunk_from_str("foobar");
        a = foobar;
        a = chunk_skip(a, 0);
-       ck_assert(chunk_equals(a, foobar));
+       ck_assert_chunk_eq(a, foobar);
        a = chunk_skip(a, 1);
-       ck_assert(chunk_equals(a, chunk_from_str("oobar")));
+       ck_assert_chunk_eq(a, chunk_from_str("oobar"));
        a = chunk_skip(a, 2);
-       ck_assert(chunk_equals(a, chunk_from_str("bar")));
+       ck_assert_chunk_eq(a, chunk_from_str("bar"));
        a = chunk_skip(a, 3);
        assert_chunk_empty(a);
 
@@ -338,20 +338,24 @@ START_TEST(test_chunk_skip_zero)
 {
        chunk_t foobar, a;
 
-       a = chunk_empty;
-       a = chunk_skip_zero(a);
+       a = chunk_skip_zero(chunk_empty);
        assert_chunk_empty(a);
 
        foobar = chunk_from_str("foobar");
-       a = foobar;
-       a = chunk_skip_zero(a);
-       ck_assert(chunk_equals(a, foobar));
+       a = chunk_skip_zero(foobar);
+       ck_assert_chunk_eq(a, foobar);
 
-       a = chunk_from_chars(0x00, 0xaa, 0xbb, 0xcc);
-       a = chunk_skip_zero(a);
-       ck_assert(chunk_equals(a, chunk_from_chars(0xaa, 0xbb, 0xcc)));
+       foobar = chunk_from_chars(0x00);
+       a = chunk_skip_zero(foobar);
+       ck_assert_chunk_eq(a, foobar);
+
+       a = chunk_skip_zero(chunk_from_chars(0x00, 0xaa, 0xbb, 0xcc));
+       ck_assert_chunk_eq(a, chunk_from_chars(0xaa, 0xbb, 0xcc));
        a = chunk_skip_zero(a);
-       ck_assert(chunk_equals(a, chunk_from_chars(0xaa, 0xbb, 0xcc)));
+       ck_assert_chunk_eq(a, chunk_from_chars(0xaa, 0xbb, 0xcc));
+
+       a = chunk_skip_zero(chunk_from_chars(0x00, 0x00, 0xaa, 0xbb, 0xcc));
+       ck_assert_chunk_eq(a, chunk_from_chars(0xaa, 0xbb, 0xcc));
 }
 END_TEST
 

diff --git a/src/libstrongswan/utils/chunk.h b/src/libstrongswan/utils/chunk.h
index 403c7f83bf1d066b68b1532b23843437d7233be8..160d09944a93303ef45bbc70adfcc0f2d7673e80 100644 (file)
--- a/src/libstrongswan/utils/chunk.h
+++ b/src/libstrongswan/utils/chunk.h
@@ -280,11 +280,11 @@ static inline chunk_t chunk_skip(chunk_t chunk, size_t bytes)
 }
 
 /**
- * Skip a leading zero-valued byte
+ * Skip any leading zero-valued bytes
  */
 static inline chunk_t chunk_skip_zero(chunk_t chunk)
 {
-       if (chunk.len > 1 && *chunk.ptr == 0x00)
+       while (chunk.len > 1 && *chunk.ptr == 0x00)
        {
                chunk.ptr++;
                chunk.len--;