..(: Declare macro args as raw (#4453)

rizinorg · Apr 21, 2024 · 652591f · 652591f
1 parent 0551f25
commit 652591f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/librz/core/cmd_descs/cmd_descs.c b/librz/core/cmd_descs/cmd_descs.c
@@ -1326,7 +1326,7 @@ static const RzCmdDescArg interpret_macro_multiple_args[] = {
 	},
 	{
 		.name = "macro-arg-set",
-		.type = RZ_CMD_ARG_TYPE_STRING,
+		.type = RZ_CMD_ARG_TYPE_RAW,
 		.flags = RZ_CMD_ARG_FLAG_ARRAY,
 		.optional = true,
 

diff --git a/librz/core/cmd_descs/cmd_interpret.yaml b/librz/core/cmd_descs/cmd_interpret.yaml
@@ -66,7 +66,7 @@ commands:
         type: RZ_CMD_ARG_TYPE_MACRO
         no_space: true
       - name: macro-arg-set
-        type: RZ_CMD_ARG_TYPE_STRING
+        type: RZ_CMD_ARG_TYPE_RAW
         flags: RZ_CMD_ARG_FLAG_ARRAY
         optional: true
       - name: )

diff --git a/test/db/cmd/write b/test/db/cmd/write
@@ -463,6 +463,7 @@ $new_addr=%v \`$addr\`+16
 .(wz16 "c `%vi 123+1` d")
 .(wz16 \`)
 .(wz16 "e \` f")
+..(wz16 \# "g \# h" "i \" j")
 EOF
 EXPECT=<<EOF
 0x00000000  5c00 0000 0000 0000 0000 0000 0000 0000  \...............
@@ -473,7 +474,11 @@ EXPECT=<<EOF
 0x00000050  6320 3132 3420 6400 0000 0000 0000 0000  c 124 d.........
 0x00000060  6000 0000 0000 0000 0000 0000 0000 0000  `...............
 0x00000070  6520 6020 6600 0000 0000 0000 0000 0000  e ` f...........
+0x00000080  2300 0000 0000 0000 0000 0000 0000 0000  #...............
+0x00000090  6720 2320 6800 0000 0000 0000 0000 0000  g # h...........
+0x000000a0  6920 2220 6a00 0000 0000 0000 0000 0000  i " j...........
 EOF
+EXPECT_ERR=
 RUN
 
 NAME=Automatically reanalyze function control flow after a write