trivial: fix up two runtime critical warnings

hughsie · Apr 20, 2010 · b2c0b12 · b2c0b12
1 parent 30e1055
commit b2c0b12
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/libzif/zif-md-filelists-xml.c b/libzif/zif-md-filelists-xml.c
@@ -434,12 +434,20 @@ zif_md_filelists_xml_search_file (ZifMd *md, gchar **search,
 		zif_completion_done (completion);
 	}
 
+	/* create results array */
+	array = g_ptr_array_new_with_free_func (g_free);
+
+	/* no entries, so shortcut */
+	if (md_filelists->priv->array->len == 0) {
+		zif_completion_done (completion);
+		goto out;
+	}
+
 	/* setup steps */
 	completion_local = zif_completion_get_child (completion);
 	zif_completion_set_number_steps (completion_local, md_filelists->priv->array->len);
 
 	/* search array */
-	array = g_ptr_array_new_with_free_func (g_free);
 	packages = md_filelists->priv->array;
 	for (i=0; i<packages->len; i++) {
 		package = g_ptr_array_index (packages, i);

diff --git a/libzif/zif-md-primary-sql.c b/libzif/zif-md-primary-sql.c
@@ -238,7 +238,9 @@ zif_md_primary_sql_get_statement_for_pred (const gchar *pred, gchar **search)
 			g_string_append (statement, " OR ");
 		g_free (temp);
 	}
-	if (i % max_items != max_items - 1) {
+
+	/* remove trailing OR entry */
+	if (g_str_has_suffix (statement->str, " OR ")) {
 		g_string_set_size (statement, statement->len - 4);
 		g_string_append (statement, ";\n");
 	}