Attachment 53501 Details for Bug 42904 – Use sqlite3_mprintf() with %q

[patch] Use sqlite3_mprintf() with %q

0001-Use-sqlite3_mprintf-to-avoid-SQL-injections.patch (text/plain), 4.49 KB, created by Vincent Untz on 2011-11-14 01:56:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vincent Untz

Created: 2011-11-14 01:56:10 UTC

Size: 4.49 KB

patch

obsolete

>From c7599e9152cae489a86d1b445fb97a82447b7eed Mon Sep 17 00:00:00 2001
>From: Vincent Untz <vuntz@gnome.org>
>Date: Mon, 14 Nov 2011 10:51:29 +0100
>Subject: [PATCH] Use sqlite3_mprintf() to avoid SQL injections
>
>https://bugs.freedesktop.org/show_bug.cgi?id=42904
>---
> src/cd-mapping-db.c |   36 ++++++++++++++++++------------------
> 1 files changed, 18 insertions(+), 18 deletions(-)
>
>diff --git a/src/cd-mapping-db.c b/src/cd-mapping-db.c
>index 6e1f4f3..e59a058 100644
>--- a/src/cd-mapping-db.c
>+++ b/src/cd-mapping-db.c
>@@ -162,8 +162,8 @@ cd_mapping_db_add (CdMappingDb *mdb,
> 	g_debug ("CdMappingDb: add %s<=>%s",
> 		 device_id, profile_id);
> 	timestamp = g_get_real_time ();
>-	statement = g_strdup_printf ("INSERT INTO mappings (device, profile, timestamp) "
>-				     "VALUES ('%s', '%s', %"G_GINT64_FORMAT")",
>+	statement = sqlite3_mprintf ("INSERT INTO mappings (device, profile, timestamp) "
>+				     "VALUES ('%q', '%q', %"G_GINT64_FORMAT")",
> 				     device_id, profile_id, timestamp);
> 
> 	/* insert the entry */
>@@ -179,7 +179,7 @@ cd_mapping_db_add (CdMappingDb *mdb,
> 		goto out;
> 	}
> out:
>-	g_free (statement);
>+	sqlite3_free (statement);
> 	return ret;
> }
> /**
>@@ -203,8 +203,8 @@ cd_mapping_db_update_timestamp (CdMappingDb *mdb,
> 	g_debug ("CdMappingDb: update timestamp %s<=>%s",
> 		 device_id, profile_id);
> 	timestamp = g_get_real_time ();
>-	statement = g_strdup_printf ("UPDATE mappings SET timestamp = %"G_GINT64_FORMAT
>-				     " WHERE device = '%s' AND profile = '%s';",
>+	statement = sqlite3_mprintf ("UPDATE mappings SET timestamp = %"G_GINT64_FORMAT
>+				     " WHERE device = '%q' AND profile = '%q';",
> 				     timestamp, device_id, profile_id);
> 
> 	/* update the entry */
>@@ -220,7 +220,7 @@ cd_mapping_db_update_timestamp (CdMappingDb *mdb,
> 		goto out;
> 	}
> out:
>-	g_free (statement);
>+	sqlite3_free (statement);
> 	return ret;
> }
> 
>@@ -242,8 +242,8 @@ cd_mapping_db_remove (CdMappingDb *mdb,
> 	g_return_val_if_fail (mdb->priv->db != NULL, FALSE);
> 
> 	g_debug ("CdMappingDb: remove %s<=>%s", device_id, profile_id);
>-	statement = g_strdup_printf ("DELETE FROM mappings WHERE "
>-				     "device = '%s' AND profile = '%s';",
>+	statement = sqlite3_mprintf ("DELETE FROM mappings WHERE "
>+				     "device = '%q' AND profile = '%q';",
> 				     device_id, profile_id);
> 
> 	/* remove the entry */
>@@ -259,7 +259,7 @@ cd_mapping_db_remove (CdMappingDb *mdb,
> 		goto out;
> 	}
> out:
>-	g_free (statement);
>+	sqlite3_free (statement);
> 	return ret;
> }
> 
>@@ -301,8 +301,8 @@ cd_mapping_db_get_profiles (CdMappingDb *mdb,
> 	g_return_val_if_fail (mdb->priv->db != NULL, FALSE);
> 
> 	g_debug ("CdMappingDb: get profiles for %s", device_id);
>-	statement = g_strdup_printf ("SELECT profile FROM mappings WHERE "
>-				     "device = '%s' ORDER BY timestamp ASC;", device_id);
>+	statement = sqlite3_mprintf ("SELECT profile FROM mappings WHERE "
>+				     "device = '%q' ORDER BY timestamp ASC;", device_id);
> 
> 	/* remove the entry */
> 	array_tmp = g_ptr_array_new_with_free_func (g_free);
>@@ -325,7 +325,7 @@ cd_mapping_db_get_profiles (CdMappingDb *mdb,
> 	array = g_ptr_array_ref (array_tmp);
> out:
> 	g_ptr_array_unref (array_tmp);
>-	g_free (statement);
>+	sqlite3_free (statement);
> 	return array;
> }
> 
>@@ -350,8 +350,8 @@ cd_mapping_db_get_devices (CdMappingDb *mdb,
> 	g_return_val_if_fail (mdb->priv->db != NULL, FALSE);
> 
> 	g_debug ("CdMappingDb: get devices for %s", profile_id);
>-	statement = g_strdup_printf ("SELECT device FROM mappings WHERE "
>-				     "profile = '%s' ORDER BY timestamp ASC;", profile_id);
>+	statement = sqlite3_mprintf ("SELECT device FROM mappings WHERE "
>+				     "profile = '%q' ORDER BY timestamp ASC;", profile_id);
> 
> 	/* remove the entry */
> 	array_tmp = g_ptr_array_new_with_free_func (g_free);
>@@ -374,7 +374,7 @@ cd_mapping_db_get_devices (CdMappingDb *mdb,
> 	array = g_ptr_array_ref (array_tmp);
> out:
> 	g_ptr_array_unref (array_tmp);
>-	g_free (statement);
>+	sqlite3_free (statement);
> 	return array;
> }
> 
>@@ -416,8 +416,8 @@ cd_mapping_db_get_timestamp (CdMappingDb *mdb,
> 
> 	g_debug ("CdMappingDb: get checksum for %s<->%s",
> 		 device_id, profile_id);
>-	statement = g_strdup_printf ("SELECT timestamp FROM mappings WHERE "
>-				     "device = '%s' AND profile = '%s' "
>+	statement = sqlite3_mprintf ("SELECT timestamp FROM mappings WHERE "
>+				     "device = '%q' AND profile = '%q' "
> 				     "LIMIT 1;", device_id, profile_id);
> 
> 	/* query the checksum */
>@@ -436,7 +436,7 @@ cd_mapping_db_get_timestamp (CdMappingDb *mdb,
> 		goto out;
> 	}
> out:
>-	g_free (statement);
>+	sqlite3_free (statement);
> 	return timestamp;
> }
> 
>-- 
>1.7.7
>

Actions: View | Splinter Review

Attachments on bug 42904: 53501 | 53844

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.