X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/3c84f5266cdde2c7fa0849ff118d1ecc173b7990..67b795eeb9c9515adb9450562a3e7e15eb63a21d:/src/uobject/uobject.c

diff --git a/src/uobject/uobject.c b/src/uobject/uobject.c
index 74734dd..3bada24 100644
--- a/src/uobject/uobject.c
+++ b/src/uobject/uobject.c
@@ -1,6 +1,6 @@
 /*
  *  upkg: tool for manipulating Unreal Tournament packages.
- *  Copyright © 2009-2011 Nick Bowler
+ *  Copyright © 2009-2012, 2015, 2020 Nick Bowler
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,9 +16,11 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <math.h>
 #include <stdarg.h>
 #include <stdbool.h>
 #include <inttypes.h>
@@ -277,6 +279,21 @@ out:
 	return obj;
 }
 
+GObject *u_object_get_by_link(GObject *go, long index)
+{
+	g_return_val_if_fail(IS_U_OBJECT(go), NULL);
+	UObject *uo = U_OBJECT(go);
+
+	if (index == 0)
+		return NULL;
+
+	if (index < 0) {
+		return get_import_object(uo, -(index+1));
+	}
+
+	return u_object_new_from_package(uo->pkg, index-1);
+}
+
 static int decode_object_property(UObject *uo, GValue *val, unsigned long len)
 {
 	struct u_object_priv *priv = U_OBJECT_GET_PRIV(uo);
@@ -285,15 +302,10 @@ static int decode_object_property(UObject *uo, GValue *val, unsigned long len)
 	int rc;
 
 	rc = upkg_decode_index(&index, priv->buf+len, priv->nbuf-len);
-	if (rc == 0 || index == 0)
+	if (rc == 0)
 		return -1;
 
-	if (index < 0) {
-		obj = get_import_object(uo, -(index+1));
-	} else {
-		obj = u_object_new_from_package(uo->pkg, index-1);
-	}
-
+	obj = u_object_get_by_link(G_OBJECT(uo), index);
 	g_value_init(val, U_TYPE_OBJECT);
 	g_value_take_object(val, obj);
 	return 0;
@@ -314,20 +326,22 @@ static unsigned long deserialize_property(UObject *uo, struct prop_head *head)
 	case PROPERTY_END:
 		break;
 	case PROPERTY_BYTE:
-		if (priv->nbuf-len < 1)
+		if (head->size != 1 || priv->nbuf-len < head->size)
 			return 0;
 		g_value_init(&val, G_TYPE_UCHAR);
 		g_value_set_uchar(&val, priv->buf[len]);
 		g_object_set_property(G_OBJECT(uo), head->prop_name, &val);
 		break;
 	case PROPERTY_INTEGER:
-		if (priv->nbuf-len < 4)
+		if (head->size != 4 || priv->nbuf-len < head->size)
 			return 0;
 		g_value_init(&val, G_TYPE_ULONG);
 		g_value_set_ulong(&val, unpack_32_le(priv->buf+len));
 		g_object_set_property(G_OBJECT(uo), head->prop_name, &val);
 		break;
 	case PROPERTY_BOOLEAN:
+		if (head->size != 0)
+			return 0;
 		g_value_init(&val, G_TYPE_BOOLEAN);
 		g_value_set_boolean(&val, head->tag_msb);
 		g_object_set_property(G_OBJECT(uo), head->prop_name, &val);
@@ -337,10 +351,23 @@ static unsigned long deserialize_property(UObject *uo, struct prop_head *head)
 		if (rc != 0)
 			return 0;
 		g_object_set_property(G_OBJECT(uo), head->prop_name, &val);
+
+		/*
+		 * g_object_set_property increments refcount,
+		 * release our reference.
+		 */
+		g_object_unref(g_value_get_object(&val));
+		break;
+	case PROPERTY_FLOAT:
+		if (head->size != 4 || priv->nbuf-len < head->size)
+			return 0;
+		g_value_init(&val, G_TYPE_FLOAT);
+		g_value_set_float(&val, u_unpack_binary32_le(priv->buf+len));
+		g_object_set_property(G_OBJECT(uo), head->prop_name, &val);
 		break;
 	default:
-		fprintf(stderr, "Unhandled property type %x\n",
-		                (unsigned)head->type);
+		u_warn(uo, "%s: unsupported property type %u",
+		           head->prop_name, (unsigned)head->type);
 	}
 	len += head->size;
 
@@ -479,13 +506,17 @@ GObject *u_object_new_from_package(GTypeModule *pkg, unsigned long idx)
 {
 	g_return_val_if_fail(IS_U_PKG(pkg), NULL);
 
-	const char *class, *package;
+	const struct upkg_export *export;
 	GObject *obj = NULL;
 	GType type;
 
-	class = upkg_export_class(U_PKG(pkg)->pkg, idx, &package);
+	export = upkg_get_export(U_PKG(pkg)->pkg, idx);
+	if (!export) {
+		u_err(pkg, "invalid package export: %lu", idx);
+		return NULL;
+	}
 
-	type = u_object_module_get_class(package, class);
+	type = u_object_module_get_class(pkg, export->class);
 	if (type) {
 		obj = g_object_new(type, NULL);
 		if (u_object_deserialize(obj, pkg, idx) != 0) {
@@ -565,18 +596,20 @@ static char *prepend_fmt(const char *prefix, const char *fmt)
 /* Logging helpers that automatically prepend the UObject class information. */
 void u_vlog_full(GObject *o, GLogLevelFlags level, const char *fmt, va_list ap)
 {
-	g_return_if_fail(IS_U_OBJECT(o));
-	UObject *uo = U_OBJECT(o);
-	char *new_fmt = NULL;
-
-	if (uo->pkg_name) {
-		new_fmt = prepend_fmt(uo->pkg_name, fmt);
-		if (!new_fmt) {
-			g_log(G_OBJECT_TYPE_NAME(o), level, "%s",
-			      uo->pkg_file->name);
-		} else {
+	char *new_fmt = NULL, *obj_prefix = NULL;
+
+	if (IS_U_OBJECT(o)) {
+		obj_prefix = U_OBJECT(o)->pkg_name;
+	} else if (G_IS_TYPE_MODULE(o)) {
+		obj_prefix = G_TYPE_MODULE(o)->name;
+	}
+
+	if (obj_prefix) {
+		new_fmt = prepend_fmt(obj_prefix, fmt);
+		if (!new_fmt)
+			g_log(G_OBJECT_TYPE_NAME(o), level, "%s", obj_prefix);
+		else
 			fmt = new_fmt;
-		}
 	}
 
 	g_logv(G_OBJECT_TYPE_NAME(o), level, fmt, ap);