Merge branch 'main' into test1234

Author: chrissie-c

lib/ringbuffer_helper.c

@@ -359,7 +359,11 @@ qb_rb_close_helper(struct qb_ringbuffer_s * rb, int32_t unlink_it,
 								   truncate_fallback);
 
 				/* the dirname part is assumed to be the same */
-				assert(!strncmp(dir_path, hdr_path, sep - data_path));
+				if (strncmp(dir_path, hdr_path, sep - data_path)) {
+					qb_util_perror(LOG_DEBUG,
+						       "header path is corrupted: %s", hdr_path);
+					res = -ENXIO;
+				}
 
 				sep = hdr_path + (sep - data_path);
 				/* now, don't touch neither data_path nor hdr_path */

tests/sock_ipc_wrapper.test

@@ -1,4 +1,4 @@
-#/bin/sh -e
+#!/bin/sh -e
 # filesystem socket IPC test
 if [ "$(uname -s)" = "Linux" ] && [ "`id -u`" = "0" ]
 then