Parse headers

Author: SSharshunov

librz/bin/format/luac/luac_bin.c

@@ -168,7 +168,8 @@ static const char *get_tag_string(ut8 tag) {
 
 /* Heap allocated string */
 static char *get_constant_symbol_name(char *proto_name, LuaConstEntry *entry) {
-	rz_return_val_if_fail(entry || proto_name, NULL);
+	rz_return_val_if_fail(entry && proto_name, NULL);
+	// rz_return_val_if_fail(entry || proto_name, NULL);
 	ut8 tag = entry->tag;
 	char *ret;
 	st64 integer_value;
@@ -186,8 +187,7 @@ static char *get_constant_symbol_name(char *proto_name, LuaConstEntry *entry) {
 		break;
 	case LUA_VSHRSTR:
 	case LUA_VLNGSTR:
-		rz_return_val_if_fail(entry->data, NULL);
-		ret = rz_str_newf("%s_const_%s", proto_name, (char *)entry->data);
+		ret = rz_str_newf("%s_const_%s", proto_name, entry->data_len ? (char *)entry->data : "NULL");
 		break;
 	case LUA_VNUMFLT:
 		rz_return_val_if_fail(entry->data, NULL);

librz/bin/format/luac/luac_common.c

@@ -6,25 +6,6 @@
 
 #include "luac_common.h"
 
-ut8 luac_header_size(const ut8 minor) {
-	const ut8 regular = strlen(LUAC_MAGIC) + 2 /* version */ + strlen(LUAC_DATA);
-	switch (minor) {
-	case 0x1:
-		return regular;
-	case 0x2:
-		return regular + 6;
-	case 0x3:
-		return regular + 22;
-	case 0x4:
-		return regular + 20;
-	case 0x5:
-		return regular + 29;
-	default:
-		rz_warn_if_reached();
-		return -1;
-	}
-}
-
 LuaDbgUpvalueEntry *lua_new_dbg_upvalue_entry() {
 	LuaDbgUpvalueEntry *entry = RZ_NEW0(LuaDbgUpvalueEntry);
 	return entry;

librz/bin/format/luac/luac_common.h

@@ -11,6 +11,7 @@
 #include <rz_lib.h>
 #include <rz_list.h>
 
+// #define RZ_DEBUG
 /* Macros for bin_luac.c */
 /* Macros/Typedefs used in luac */
 typedef double LUA_NUMBER;
@@ -88,6 +89,7 @@ typedef ut32 LUA_INT;
 #define LUAC_55_NUMBER_VALID_OFFSET     0x17
 #define LUAC_55_UPVALUES_NUMBER_OFFSET  0x1F
 
+#define LUAC_MAGIC              "\x1b\x4c\x75\x61" ///< "\033Lua"
 #define LUAC_FORMAT             0 /* this is the official format */
 #define LUAC_DATA               "\x19\x93\r\n\x1a\n"
 #define LUAC_INT_VALIDATION     luac_cast_int(0x5678)
@@ -103,8 +105,6 @@ typedef ut32 LUA_INSTRUCTION;
 #define LUAC_VERSION_OFFSET 0x04
 #define LUAC_VERSION_SIZE   1
 
-#define LUAC_MAGIC "\x1b\x4c\x75\x61" ///< "\033Lua"
-
 /* Body */
 #define LUAC51_FILENAME_OFFSET 0x13
 #define LUAC52_FILENAME_OFFSET 0x00
@@ -161,6 +161,7 @@ typedef struct lua_proto_ex {
 	RzList /*<LuaUpvalueEntry *>*/ *upvalue_entries; ///< A list to store upvalue entries
 	ut64 upvalue_offset; ///< upvalue section offset
 	ut64 upvalue_size; ///< upvalue section size
+	ut64 size_upvalues; ///< upvalue size (v5.5)
 
 	/* store protos defined in this proto */
 	RzList /*<LuaProto *>*/ *proto_entries; ///< A list to store sub proto entries
@@ -179,6 +180,26 @@ typedef struct lua_proto_ex {
 
 typedef LuaProtoHeavy LuaProto;
 
+/**
+ * \struct lua_header_info
+ * \brief Store header information of luac file
+ */
+typedef struct lua_header_info {
+	st32 major; ///< major version
+	st32 minor; ///< minor version
+	// ut8 version; ///< type of this constant, see LUA_V* macros in luac_common.h
+	ut8 format; ///< type of this constant, see LUA_V* macros in luac_common.h
+	ut8 endianness; ///< type of this constant, see LUA_V* macros in luac_common.h
+	st32 int_size; ///< type of this constant, see LUA_V* macros in luac_common.h
+	ut8 size_t_size; ///< type of this constant, see LUA_V* macros in luac_common.h
+	st32 instruction_size; ///< type of this constant, see LUA_V* macros in luac_common.h
+	st32 integer_size; ///< type of this constant, see LUA_V* macros in luac_common.h
+	st32 number_size; ///< type of this constant, see LUA_V* macros in luac_common.h
+	ut8 is_number_integral; ///< is lua_Number integral? (< 5.3)
+	size_t psize; ///< Physical size of header in bytes
+	char *src_file_name;
+} LuaHeaderInfo;
+
 /**
  * \struct lua_constant_entry
  * \brief Store constant type, data, and offset of this constant in luac file
@@ -246,18 +267,17 @@ typedef struct lua_dbg_upvalue_entry {
 } LuaDbgUpvalueEntry;
 
 /**
- * \struct lua_bin_info
+ * \struct luac_bin_info
  * \brief A context info structure for luac plugin.
  */
 typedef struct luac_bin_info {
-	st32 major; ///< major version
-	st32 minor; ///< minor version
 	LuaProto *proto;
 	RzPVector /*<RzBinSection *>*/ *section_vec; ///< list of sections
 	RzList /*<RzBinSymbol *>*/ *symbol_list; ///< list of symbols
 	RzPVector /*<RzBinAddr *>*/ *entry_vec; ///< list of entries
 	RzList /*<RzBinString *>*/ *string_list; ///< list of strings
 	RzBinInfo *general_info; ///< general binary info from luac header
+	LuaHeaderInfo *header;
 } LuacBinInfo;
 
 /* ========================================================
@@ -294,23 +314,18 @@ void _luac_build_info(LuaProto *proto, LuacBinInfo *info);
  * Export version specified Api to bin_luac.c
  * Implemented in bin/format/luac/v[version]/bin_[version]
  * ======================================================== */
-RzBinInfo *lua_parse_header_54(RzBinFile *bf, st8 major, st8 minor);
+RzBinInfo *lua_parse_header_54(RzBinFile *bf, ut8 major, ut8 minor);
 LuaProto *lua_parse_body_54(RzBuffer *buffer, ut64 offset, ut64 data_size);
 
-RzBinInfo *lua_parse_header_53(RzBinFile *bf, st8 major, st8 minor);
+RzBinInfo *lua_parse_header_53(RzBinFile *bf, ut8 major, ut8 minor);
 LuaProto *lua_parse_body_53(RzBuffer *buffer, ut64 offset, ut64 data_size);
 
-RzBinInfo *lua_parse_header_52(RzBinFile *bf, st8 major, st8 minor);
+RzBinInfo *lua_parse_header_52(RzBinFile *bf, ut8 major, ut8 minor);
 LuaProto *lua_parse_body_52(RzBuffer *buffer, ut64 offset, ut64 data_size);
 
-ut8 luac_header_size(const ut8 minor);
-// static void lua_load_block(RzBuffer *buffer, void *dest, size_t size, ut64 offset, ut64 data_size);
-// static ut64 lua_load_integer(RzBuffer *buffer, ut64 offset);
-// static double lua_load_number(RzBuffer *buffer, ut64 offset);
-// static ut32 lua_load_int(RzBuffer *buffer, ut64 offset);
-// static ut64 lua_parse_name(LuaProto *proto, RzBuffer *buffer, ut64 offset, ut64 data_size, st8 minor);
-LuaProto *lua_parse_body(RzBuffer *buffer, ut64 base_offset, ut64 data_size, st8 minor);
-RzBinInfo *lua_parse_header(const RzBinFile *bf, st8 major, st8 minor);
+LuaProto *lua_parse_body(RzBuffer *buffer, LuaHeaderInfo *header, ut64 base_offset, ut64 data_size);
+RzBinInfo *lua_parse_header(const RzBinFile *bf, const LuaHeaderInfo *header);
+size_t parse_header(const RzBinFile *bf, LuaHeaderInfo *header);
 
 #define lua_check_error_offset(offset) \
 	if ((offset) == 0) { \