X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=types%2Ftypes.c;h=08324acc481dd5e594525282d3329d4a15459f41;hb=ff00cad2a14ea6dad073761b3dbb4aaa259723d0;hp=80ba4eae69a03f809ae6a768db521beb23e4bdfd;hpb=78af2bcd1a8236a26371d7638ab7acb2d41b6807;p=babeltrace.git

diff --git a/types/types.c b/types/types.c
index 80ba4eae..08324acc 100644
--- a/types/types.c
+++ b/types/types.c
@@ -255,6 +255,8 @@ void declaration_ref(struct declaration *declaration)
 
 void declaration_unref(struct declaration *declaration)
 {
+	if (!declaration)
+		return;
 	if (!--declaration->ref)
 		declaration->declaration_free(declaration);
 }
@@ -266,6 +268,8 @@ void definition_ref(struct definition *definition)
 
 void definition_unref(struct definition *definition)
 {
+	if (!definition)
+		return;
 	if (!--definition->ref)
 		definition->declaration->definition_free(definition);
 }
@@ -508,6 +512,7 @@ void append_scope_path(const char *path, GArray *q)
 		quark = g_quark_from_string(str);
 		g_array_append_val(q, quark);
 		g_free(str);
+		ptrend++;	/* skip current dot */
 	}
 	/* last. Check for trailing dot (and discard). */
 	if (ptrbegin[0] != '\0') {