diff --git a/ChangeLog b/ChangeLog
index 1acf9815..18f6ca1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-12  Nick Treleaven  <nick.treleaven@btinternet.com>
+
+ * tagmanager/sql.c:
+   Fix #1717418, Hang on SQL file load.
+
+
 2007-05-11  Nick Treleaven  <nick.treleaven@btinternet.com>
 
  * src/utils.c, src/utils.h, src/search.c:
diff --git a/tagmanager/sql.c b/tagmanager/sql.c
index 3b576c3d..2d5f082e 100644
--- a/tagmanager/sql.c
+++ b/tagmanager/sql.c
@@ -544,7 +544,7 @@ getNextChar:
 			break;
 		    else
 			fileUngetc (c);
-		} while (c != '\0');
+		} while (c != EOF && c != '\0');
 		goto getNextChar;
 	    }
 	    break;