Release 6.2.2

.github/workflows/ci.yml

@@ -1,7 +1,7 @@
 name: ci
 
 env:
-  R2V: 6.2.0
+  R2V: 6.2.2
 
 on:
   push:

configure

@@ -126,12 +126,12 @@ done
 : ${INSTALL_PROGRAM_STRIP:=${INSTALL} -m 755 -s}
 : ${INSTALL_MAN:=${INSTALL} -m 444}
 : ${INSTALL_LIB:=${INSTALL} -m 755 -c}
- PKGNAME='r2ghidra' ; VERSION='6.2.0' ; VERSION_MAJOR=6; VERSION_MINOR=2; VERSION_PATCH=0; VERSION_NUMBER=60200; CONTACT_MAIL="[email protected]" ; CONTACT_NAME="pancake" ; CONTACT="pancake <[email protected]>" ;
+ PKGNAME='r2ghidra' ; VERSION='6.2.2' ; VERSION_MAJOR=6; VERSION_MINOR=2; VERSION_PATCH=2; VERSION_NUMBER=60202; CONTACT_MAIL="[email protected]" ; CONTACT_NAME="pancake" ; CONTACT="pancake <[email protected]>" ;
 }
 
 show_usage() {
 cat <<EOF2
-'configure' configures r2ghidra-6.2.0 to adapt to many kinds of systems.
+'configure' configures r2ghidra-6.2.2 to adapt to many kinds of systems.
 
 Usage: ./configure [OPTION]... [VAR=VALUE]...
 
@@ -203,10 +203,10 @@ ocho() {
 
 show_version() {
 if [ "$QUIET" = 1 ]; then
-	echo "6.2.0"
+	echo "6.2.2"
 	exit 0
 fi
-echo "r2ghidra-6.2.0 configuration script done with acr v2.2.8.
+echo "r2ghidra-6.2.2 configuration script done with acr v2.2.8.
 The 'Free Software Foundation' message is only for autodetection.
 Originally written by pancake <nopcode.org>."
 exit 0
@@ -235,12 +235,11 @@ case $flag in
 	show_version ; ;;
 -r|--r|--report)
 echo "PKGNAME:     r2ghidra"
-echo "VERSION:     6.2.0"
+echo "VERSION:     6.2.2"
 echo "AUTHOR:      pancake"
 echo "EMAIL:       [email protected]"
 echo "LANGS:       c++"
 echo "PKGCONFIG:   r_core r_asm r_anal"
-echo "FLAGS:       "
 	exit 0
 	;;
 --cache-file)
@@ -424,14 +423,6 @@ tmp=`${PKGCONFIG} --libs r_core 2>/dev/null`
 if [ $? = 0 ]; then
 echo yes; HAVE_PKGCFG_R_CORE=1;
 R2_LDFLAGS=$tmp; fi; fi
-printf 'checking radare2 >= 6.1.4 for the rxml API... '
-if ${PKGCONFIG} --atleast-version=6.1.4 r_core 2>/dev/null; then
-echo yes
-else
-echo no
-echo 'ERROR: r2ghidra requires radare2 >= 6.1.4' >&2
-exit 1
-fi
 if [ -z "${PKGCONFIG}" ]; then pkg-config --version >/dev/null 2>&1 ; if [ 0 = 0 ]; then PKGCONFIG=pkg-config ; else PKGCONFIG=pkgconf ; fi; fi
 printf 'checking pkg-config flags for r_asm... '
 tmp=`${PKGCONFIG} --cflags r_asm 2>/dev/null`

configure.acr

@@ -1,5 +1,5 @@
 PKGNAME r2ghidra
-VERSION 6.2.0
+VERSION 6.2.2
 CONTACT pancake ; [email protected]
 
 LANG_CXX!

dist/windows/r2pm/r2pm-i.ps1

@@ -1,6 +1,6 @@
 # powershell -executionpolicy unrestricted -command r2pm.ps1
 $R2_USER_PLUGINS=(radare2 -H R2_USER_PLUGINS)
-$V="6.2.0"
+$V="6.2.2"
 Remove-Item r2ghidra-${V}-w64.zip
 Remove-Item r2ghidra_sleigh-${V}.zip
 echo "Downloading blobs"

meson.build

@@ -3,7 +3,7 @@ project(
   ['c', 'cpp'],
   license : 'LGPL3',
   meson_version : '>=0.50.1',
-  version : '6.2.0',
+  version : '6.2.2',
   default_options : ['c_std=c11', 'cpp_std=c++20', 'b_vscrt=md']
 )
 

test/db/extras/ghidra_types

@@ -1196,7 +1196,7 @@ void sym.Aeropause(Bright *bright,int32_t argc,char **argv)
     Morning *pMVar3;
     int64_t var_18h;
     int32_t var_ch;
-    void **var_8h;
+    char *s1;
     
     pMVar3 = sym.imp.malloc(0x10);
     bright->morning = pMVar3;

test/db/extras/r2ghidra_arch

@@ -305,7 +305,7 @@ CMDS=<<EOF
 EOF
 EXPECT=<<EOF
 
-uint32_t sym.isFileExist(uint param_1)
+uint32_t sym.isFileExist(char *param_1)
 
 {
     uint32_t uVar1;

test/db/extras/r2ghidra_output

@@ -943,9 +943,9 @@ e r2ghidra.varargs=true
 aaa
 pdg @ sym.p_snprintf~n=%d
 EOF2
-EXPECT=<<EOF2
-    iVar1 = sym.imp.snprintf(*0x1fd0,0x40,"n=%d x=%x",arg1,arg2);
-EOF2
+EXPECT=<<EOF
+    iVar1 = sym.imp.snprintf(_reloc.g_buf,0x40,"n=%d x=%x",arg1,arg2);
+EOF
 RUN
 
 NAME=scanf-family is left untouched by printf vararg recovery
@@ -982,9 +982,9 @@ e r2ghidra.varargs=true
 aaa
 pdg @ sym.p_snprintf~n=%d
 EOF2
-EXPECT=<<EOF2
-    iVar1 = sym.imp.snprintf(*0x1fd0,0x40,"n=%d x=%x",arg1,arg2);
-EOF2
+EXPECT=<<EOF
+    iVar1 = sym.imp.snprintf(_reloc.g_buf,0x40,"n=%d x=%x",arg1,arg2);
+EOF
 RUN
 
 NAME=ppc64 printf float vararg lands in an fp register under pdg
@@ -1024,9 +1024,9 @@ fr sym.imp.snprintf sym.imp.mylog
 td int mylog(char *dst, int n, const char *fmt, ...)
 pdg @ sym.p_snprintf~n=%d
 EOF2
-EXPECT=<<EOF2
-    iVar1 = sym.imp.snprintf(*0x1fd0,0x40,"n=%d x=%x",arg1,arg2);
-EOF2
+EXPECT=<<EOF
+    iVar1 = sym.imp.snprintf(_reloc.g_buf,0x40,"n=%d x=%x",arg1,arg2);
+EOF
 RUN
 
 NAME=a formatter absent from r2ghidra.varargs.formats is left to decompiler liveness
@@ -1039,9 +1039,9 @@ fr sym.imp.snprintf sym.imp.mylog
 td int mylog(char *dst, int n, const char *fmt, ...)
 pdg @ sym.p_snprintf~n=%d
 EOF2
-EXPECT=<<EOF2
-    iVar1 = sym.imp.snprintf(*0x1fd0,0x40,"n=%d x=%x",arg1 & 0xffffffff,arg2 & 0xffffffff);
-EOF2
+EXPECT=<<EOF
+    iVar1 = sym.imp.snprintf(_reloc.g_buf,0x40,"n=%d x=%x",arg1 & 0xffffffff,arg2 & 0xffffffff);
+EOF
 RUN
 
 NAME=readonly propagation does not fold relocation targets to their on-disk zero

test/db/extras/r2ghidra_types

@@ -1196,7 +1196,7 @@ void sym.Aeropause(Bright *bright,int32_t argc,char **argv)
     Morning *pMVar3;
     int64_t var_18h;
     int32_t var_ch;
-    void **var_8h;
+    char *s1;
     
     pMVar3 = sym.imp.malloc(0x10);
     bright->morning = pMVar3;