Merge branch 'maint-1.2' into maint-1.3

Author: jan-cerny

src/OVAL/probes/SEAP/MurmurHash3.c

@@ -128,13 +128,18 @@ void MurmurHash3_x86_32 ( const void * key, int len,
 
   uint32_t k1 = 0;
 
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
   switch(len & 3)
   {
   case 3: k1 ^= tail[2] << 16;
   case 2: k1 ^= tail[1] << 8;
   case 1: k1 ^= tail[0];
           k1 *= c1; k1 = ROTL32(k1,15); k1 *= c2; h1 ^= k1;
   };
+#pragma GCC diagnostic pop
+#endif
 
   //----------
   // finalization
@@ -203,6 +208,9 @@ void MurmurHash3_x86_128 ( const void * key, const int len,
   uint32_t k3 = 0;
   uint32_t k4 = 0;
 
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
   switch(len & 15)
   {
   case 15: k4 ^= tail[14] << 16;
@@ -228,6 +236,8 @@ void MurmurHash3_x86_128 ( const void * key, const int len,
   case  1: k1 ^= tail[ 0] << 0;
            k1 *= c1; k1  = ROTL32(k1,15); k1 *= c2; h1 ^= k1;
   };
+#pragma GCC diagnostic pop
+#endif
 
   //----------
   // finalization
@@ -292,6 +302,9 @@ void MurmurHash3_x64_128 ( const void * key, const int len,
   uint64_t k1 = 0;
   uint64_t k2 = 0;
 
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
   switch(len & 15)
   {
   case 15: k2 ^= (uint64_t)(tail[14]) << 48;
@@ -313,6 +326,8 @@ void MurmurHash3_x64_128 ( const void * key, const int len,
   case  1: k1 ^= (uint64_t)(tail[ 0]) << 0;
            k1 *= c1; k1  = ROTL64(k1,31); k1 *= c2; h1 ^= k1;
   };
+#pragma GCC diagnostic pop
+#endif
 
   //----------
   // finalization

tests/probes/process58/command_line.sh

@@ -24,10 +24,14 @@ function get_process_cmdline() {
 # We can scan processes before process's exec() and get wrong command_line
 function wait_for_process() {
 	local PID="$1"
+	local PROC_NAME="$2"
+	if [[ -z "$PROC_NAME" ]]; then
+		PROC_NAME="$PROC"
+	fi
 	for i in $(seq 1 100); # wait max 100 * 300ms
 		do
 			PROCESS_CMDLINE=$(get_process_cmdline "$PID")
-			[[ "${PROCESS_CMDLINE}" == *${PROC}* ]] && break
+			[[ "${PROCESS_CMDLINE}" == *${PROC_NAME}* ]] && break
 			sleep 0.3s
 		done
 }
@@ -86,7 +90,7 @@ echo "stderr file: $stderr"
 	CMDLINE_REGEX='/(\w+/)+bash.*stopped_process\.sh param1 param2 param3$'
 
 	# Run zombie process (without full cmdline)
-	( : & exec "${PROC}" ) &
+	( SHELL_PID=$BASHPID && ( kill -STOP $SHELL_PID && sleep 1 ) ) &
 	ZOMBIE_PPID=$!
 	ZOMBIE_PID=$(get_zombie_pid_from_ppid ${ZOMBIE_PPID})
 	[ -n "${ZOMBIE_PPID}" ]
@@ -104,7 +108,7 @@ echo "stderr file: $stderr"
 ### Wait for start of all processes (all processes have done exec())
 ########################################################################
 	wait_for_process $PID
-	wait_for_process ${ZOMBIE_PID}
+	wait_for_process ${ZOMBIE_PID} "command_line.sh"
 	wait_for_process ${ESCAPED_PID}
 
 ########################################################################