[tracker] libtracker-common: Fixed regression in tracker_coalesce()



commit 808c5a2ad9f19a388f969a0066d93b4685b67074
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Nov 5 12:46:38 2009 +0000

    libtracker-common: Fixed regression in tracker_coalesce()
    
    Don't check !result in the for loop, we still need to free strings
    unused in there.

 src/libtracker-common/tracker-utils.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/libtracker-common/tracker-utils.c b/src/libtracker-common/tracker-utils.c
index efe10fe..d69c91f 100644
--- a/src/libtracker-common/tracker-utils.c
+++ b/src/libtracker-common/tracker-utils.c
@@ -511,11 +511,11 @@ tracker_coalesce (gint n_values,
 
 	va_start (args, n_values);
 
-	for (i = 0; i < n_values && !result; i++) {
+	for (i = 0; i < n_values; i++) {
 		gchar *value;
 
 		value = va_arg (args, gchar *);
-		if (!tracker_is_blank_string (value)) {
+		if (!result && !tracker_is_blank_string (value)) {
 			result = g_strstrip (value);
 		} else {
 			g_free (value);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]