From d5cd8656fdd13ef4cb82a89fada908c85fc5b119 Mon Sep 17 00:00:00 2001
From: Martin Stjernholm <mast@lysator.liu.se>
Date: Mon, 4 Jan 2010 18:18:18 +0100
Subject: [PATCH] Fixed infinite looping on unbalanced quotes in queries in
utf-8 encode mode.
Rev: lib/modules/Sql.pmod/mysql.pike:1.46
---
lib/modules/Sql.pmod/mysql.pike | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/lib/modules/Sql.pmod/mysql.pike b/lib/modules/Sql.pmod/mysql.pike
index 9b29dff092..99753c4e4b 100644
--- a/lib/modules/Sql.pmod/mysql.pike
+++ b/lib/modules/Sql.pmod/mysql.pike
@@ -1,5 +1,5 @@
/*
- * $Id: mysql.pike,v 1.45 2009/11/11 13:38:19 grubba Exp $
+ * $Id: mysql.pike,v 1.46 2010/01/04 17:18:18 mast Exp $
*
* Glue for the Mysql-module
*/
@@ -410,6 +410,11 @@ string utf8_encode_query (string q, function(string:string) encode_fn)
break;
}
+ if (end < 0)
+ // The query ends in a quoted string. We pretend it continues to
+ // the end and let MySQL complain later.
+ end = sizeof (suffix);
+
#define IS_IDENTIFIER_CHAR(chr) (Unicode.is_wordchar (chr) || \
(<'_', '$'>)[chr])
--
GitLab