Add a test on child executable embeding

shell.c

@@ -29,8 +29,23 @@ int asmsh_init(asmsh_t *sh, const char *child_path)
 		asmsh_env_free(sh->env);
 		goto err;
 	}
-	sh->child_path = strdup(child_path); // TODO check error
+	if(child_path)
+	{
+		if(!(sh->child_path = strdup(child_path)))
+		{
+			perror("Unable to copy child path");
+			goto err_all;
+		}
+	}
+	else
+	{
+		sh->child_path = NULL;
+	}
 	return 0;
+
+err_all:
+	asmsh_asmc_ctx_free(sh->cctx);
+	asmsh_env_free(sh->env);
 err:
 	bzero(sh, sizeof(asmsh_t));
 	return -1;

tests/tests_asm_env.c

@@ -222,6 +222,48 @@ START_TEST(test_env_regs)
 END_TEST
 
 
+START_TEST(test_embed_env_exit42)
+{
+	const char childpath[] = REAL_CHILD;
+
+	asmsh_asmc_ctx_t *cctx;
+	asmsh_bytecode_t bcode;
+	int ret, status;
+
+	asmsh_env_t *env = asmsh_env(NULL);
+	ck_assert_ptr_nonnull(env);
+
+	cctx = asmsh_asmc_ctx_default();
+	ck_assert_ptr_nonnull(cctx);
+
+	ck_assert_int_ge(asmsh_asmc_compile(cctx, "mov $60, %rax", &bcode), 0);
+	ck_assert_int_ge(asmsh_env_write_code(env, &bcode), 0);
+	ck_assert_int_ge(asmsh_asmc_compile(cctx, "mov $42, %rdi", &bcode), 0);
+	ck_assert_int_ge(asmsh_env_write_code(env, &bcode), 0);
+	ck_assert_int_ge(asmsh_asmc_compile(cctx, "syscall", &bcode), 0);
+	ck_assert_int_ge(asmsh_env_write_code(env, &bcode), 0);
+
+	asmsh_asmc_ctx_free(cctx);
+
+	for(int i=0; i<2; i++)
+	{
+		ret = asmsh_env_step(env, &status);
+		ck_assert_int_eq(ret, 0);
+		ck_assert_msg(WCOREDUMP(status) ==  0, "SEGFAULT");
+		ck_assert_int_ne(WIFSTOPPED(status), 0);
+		ck_assert_int_eq(status>>8, 5);
+	}
+	ret = asmsh_env_step(env, &status);
+	ck_assert_int_eq(ret, 1);
+	ck_assert(WIFEXITED(status));
+	ck_assert_int_eq(WEXITSTATUS(status), 42);
+
+	asmsh_env_free(env);
+
+}
+END_TEST
+
+
 ASMSH_CHECK_START("Testing asm env", "testing asm environment")
 	ASMSH_ADD_TEST(test_env);
 	ASMSH_ADD_TEST(test_asm_stamps);
@@ -229,5 +271,6 @@ ASMSH_CHECK_START("Testing asm env", "testing asm environment")
 	ASMSH_ADD_TEST(test_env_exit42);
 	ASMSH_ADD_TEST(test_env_steps);
 	ASMSH_ADD_TEST(test_env_regs);
+	ASMSH_ADD_TEST(test_embed_env_exit42);
 ASMSH_CHECK_END
 

tests/tests_shell.c

@@ -44,9 +44,23 @@ START_TEST(test_cmd)
 }
 END_TEST
 
+START_TEST(test_embed)
+{
+	asmsh_t sh;
+	ck_assert_int_eq(asmsh_init(&sh, NULL), 0);
+	ck_assert_int_eq(asmsh_exec(&sh, "mov $60, %rax"), 0);
+	ck_assert_int_eq(asmsh_exec(&sh, "xor %rdi, %rdi"), 0);
+	ck_assert_int_eq(asmsh_exec(&sh, "syscall"), 1);
+	asmsh_cleanup(&sh);
+
+
+}
+END_TEST
+
 ASMSH_CHECK_START("Testing shell", "testing shell init/exec functions")
 	ASMSH_ADD_TEST(test_init);
 	ASMSH_ADD_TEST(test_exit);
 	ASMSH_ADD_TEST(test_cmd);
+	ASMSH_ADD_TEST(test_embed);
 ASMSH_CHECK_END