Fix insertion of non hex encoded payload data

diff --git a/src/conftest/hooks/add_notify.c b/src/conftest/hooks/add_notify.c
index 4ae7c2db700be64b39b4ab7e9f0b30b3f0f67da3..00833265f9dd2612b9f779d466486e1f62ecf497 100644 (file)
--- a/src/conftest/hooks/add_notify.c
+++ b/src/conftest/hooks/add_notify.c
@@ -85,7 +85,7 @@ METHOD(listener_t, message, bool,
                        data = chunk_skip(chunk_create(this->data, strlen(this->data)), 2);
                        data = chunk_from_hex(data, NULL);
                }
-               else if (data.len)
+               else if (this->data && strlen(this->data))
                {
                        data = chunk_clone(chunk_create(this->data, strlen(this->data)));
                }

diff --git a/src/conftest/hooks/add_payload.c b/src/conftest/hooks/add_payload.c
index 132bac7c5f4916522f8088a76157cc9de1893ba8..9de18c52e0f905284ca17b16cef285a2d57c33cf 100644 (file)
--- a/src/conftest/hooks/add_payload.c
+++ b/src/conftest/hooks/add_payload.c
@@ -82,7 +82,7 @@ METHOD(listener_t, message, bool,
                        data = chunk_skip(chunk_create(this->data, strlen(this->data)), 2);
                        data = chunk_from_hex(data, NULL);
                }
-               else if (data.len)
+               else if (this->data && strlen(this->data))
                {
                        data = chunk_clone(chunk_create(this->data, strlen(this->data)));
                }

diff --git a/src/conftest/hooks/unencrypted_notify.c b/src/conftest/hooks/unencrypted_notify.c
index 1d7f42def33b0fe46063bad5c2ed27ecd4e43c24..8737158adadc59d8603e2b77aa170759b2cec6fc 100644 (file)
--- a/src/conftest/hooks/unencrypted_notify.c
+++ b/src/conftest/hooks/unencrypted_notify.c
@@ -80,7 +80,7 @@ METHOD(listener_t, ike_updown, bool,
                        data = chunk_skip(chunk_create(this->data, strlen(this->data)), 2);
                        data = chunk_from_hex(data, NULL);
                }
-               else if (data.len)
+               else if (this->data && strlen(this->data))
                {
                        data = chunk_clone(chunk_create(this->data, strlen(this->data)));
                }