Fix

Author: mooncat-greenpy

src/main/java/golanganalyzerextension/version/GolangBuildInfo.java

@@ -67,16 +67,26 @@ String find_go_version(Address base_addr) throws BinaryAccessException {
 
 	Optional<String> find_module_version(Address base_addr) throws BinaryAccessException {
 		byte size=(byte)go_bin.get_address_value(base_addr, 14, 1);
+		byte endian=(byte)go_bin.get_address_value(base_addr, 15, 1);
 
-		long addr_value=go_bin.get_address_value(base_addr, 16+size, size);
-		if(!go_bin.is_valid_address(addr_value)) {
-			return Optional.empty();
-		}
-		Address bytes_addr=go_bin.get_address(go_bin.get_address_value(addr_value, size));
-		if(!go_bin.is_valid_address(bytes_addr)) {
-			return Optional.empty();
+		Address bytes_addr;
+		long bytes_size;
+		if((endian&2)==0) {
+			long addr_value=go_bin.get_address_value(base_addr, 16+size, size);
+			if(!go_bin.is_valid_address(addr_value)) {
+				return Optional.empty();
+			}
+			bytes_addr=go_bin.get_address(go_bin.get_address_value(addr_value, size));
+			if(!go_bin.is_valid_address(bytes_addr)) {
+				return Optional.empty();
+			}
+			bytes_size=go_bin.get_address_value(addr_value + size, size);
+		} else {
+			long ver_str_size=go_bin.get_address_value(base_addr, 32, 1);
+			Address go_ver_end_addr=go_bin.get_address(base_addr, 32+1+ver_str_size);
+			bytes_addr=go_bin.get_address(go_ver_end_addr, 1);
+			bytes_size=go_bin.get_address_value(go_ver_end_addr, 1);
 		}
-		long bytes_size=go_bin.get_address_value(addr_value + size, size);
 
 		// runtime/debug/mod.go
 		Address mod_bytes_addr=go_bin.get_address(bytes_addr, 16);

src/main/java/golanganalyzerextension/version/SysTheVersion.java

@@ -108,15 +108,19 @@ private boolean is_sys_the_version_string_struct(Address string_struct_addr, Str
 		if(size!=sys_the_version.length()) {
 			return false;
 		}
+		GolangVersion go_version=new GolangVersion(sys_the_version);
+		if(go_version.lt("go1.8beta1")) {
+			return true;
+		}
 
 		// runtime/proc.go
 		boolean badmorestackg0Msg=false;
 		boolean badmorestackgsignalMsg=false;
-		for(int i=-4; i<4; i++) {
+		for(int i=-8; i<8; i++) {
 			Address around_str_addr;
 			String around_str;
 			try {
-				around_str_addr=go_bin.get_address(string_struct_addr, go_bin.get_pointer_size()*2*i);
+				around_str_addr=go_bin.get_address(string_struct_addr, go_bin.get_pointer_size()*1*i);
 				around_str=go_bin.read_string_struct(around_str_addr, go_bin.get_pointer_size());
 			} catch (BinaryAccessException | InvalidBinaryStructureException e) {
 				continue;
@@ -128,8 +132,7 @@ private boolean is_sys_the_version_string_struct(Address string_struct_addr, Str
 				badmorestackgsignalMsg=true;
 			}
 		}
-		GolangVersion go_version=new GolangVersion(sys_the_version);
-		if(go_version.ge("go1.8beta1") && (!badmorestackg0Msg || !badmorestackgsignalMsg)) {
+		if(!badmorestackg0Msg || !badmorestackgsignalMsg) {
 			return false;
 		}