Attachment 831855 Details for Bug 1026283 – simpler

[patch] simpler

tracker-infinite-loop-UNTESTED.patch (text/plain), 1.78 KB, created by Michael Catanzaro on 2013-12-03 01:56:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Catanzaro

Created: 2013-12-03 01:56:36 UTC

Size: 1.78 KB

patch

obsolete

>From ab10d0eb9125aa65710c9f7bcd5cb4352e97b644 Mon Sep 17 00:00:00 2001
>From: Michael Catanzaro <mcatanzaro@gnome.org>
>Date: Mon, 2 Dec 2013 19:37:12 -0600
>Subject: [PATCH] Don't infinite loop when sqlite3_step errors
>
>This function has around 80 different error return codes to pick from.
>Don't assume it will ever return SQLITE_DONE.
>---
> src/libtracker-fts/tracker-fts.c | 20 ++++++++------------
> 1 file changed, 8 insertions(+), 12 deletions(-)
>
>diff --git a/src/libtracker-fts/tracker-fts.c b/src/libtracker-fts/tracker-fts.c
>index 530d831..8a9d1f4 100644
>--- a/src/libtracker-fts/tracker-fts.c
>+++ b/src/libtracker-fts/tracker-fts.c
>@@ -144,12 +144,10 @@ function_weights (sqlite3_context *context,
> 		                         "ORDER BY \"rdf:Property\".ID ",
> 		                         -1, &stmt, NULL);
> 
>-		while ((rc = sqlite3_step (stmt)) != SQLITE_DONE) {
>-			if (rc == SQLITE_ROW) {
>-				guint weight;
>-				weight = sqlite3_column_int (stmt, 0);
>-				g_array_append_val (weight_array, weight);
>-			}
>+		while ((rc = sqlite3_step (stmt)) == SQLITE_ROW) {
>+			guint weight;
>+			weight = sqlite3_column_int (stmt, 0);
>+			g_array_append_val (weight_array, weight);
> 		}
> 
> 		if (rc == SQLITE_DONE) {
>@@ -188,13 +186,11 @@ function_property_names (sqlite3_context *context,
> 		                         "ORDER BY \"rdf:Property\".ID ",
> 		                         -1, &stmt, NULL);
> 
>-		while ((rc = sqlite3_step (stmt)) != SQLITE_DONE) {
>-			if (rc == SQLITE_ROW) {
>-				const gchar *name;
>+		while ((rc = sqlite3_step (stmt)) == SQLITE_ROW) {
>+			const gchar *name;
> 
>-				name = sqlite3_column_text (stmt, 0);
>-				g_ptr_array_add (names_array, g_strdup (name));
>-			}
>+			name = sqlite3_column_text (stmt, 0);
>+			g_ptr_array_add (names_array, g_strdup (name));
> 		}
> 
> 		if (rc == SQLITE_DONE) {
>-- 
>1.8.3.1
>

Actions: View | Diff

Attachments on bug 1026283: 819049 | 826778 | 828607 | 829845 | 829847 | 831855 | 831857