080a160c7b9595d516c9c70e83689a09b60839d0
galt
  Mon Jun 3 12:16:53 2013 -0700
fix SQL Injection
diff --git src/hg/lib/tfbsConsMap.c src/hg/lib/tfbsConsMap.c
index d013f7a..c99e6f3 100644
--- src/hg/lib/tfbsConsMap.c
+++ src/hg/lib/tfbsConsMap.c
@@ -81,63 +81,39 @@
 while ((row = sqlNextRow(sr)) != NULL)
     {
     el = tfbsConsMapLoad(row);
     slAddHead(&list, el);
     }
 slReverse(&list);
 sqlFreeResult(&sr);
 return list;
 }
 
 void tfbsConsMapSaveToDb(struct sqlConnection *conn, struct tfbsConsMap *el, char *tableName, int updateSize)
 /* Save tfbsConsMap as a row to the table specified by tableName. 
  * As blob fields may be arbitrary size updateSize specifies the approx size
  * of a string that would contain the entire query. Arrays of native types are
  * converted to comma separated strings and loaded as such, User defined types are
- * inserted as NULL. Note that strings must be escaped to allow insertion into the database.
- * For example "autosql's features include" --> "autosql\'s features include" 
- * If worried about this use tfbsConsMapSaveToDbEscaped() */
+ * inserted as NULL. Strings are automatically escaped to allow insertion into the database. */
 {
 struct dyString *update = newDyString(updateSize);
-dyStringPrintf(update, "insert into %s values ( '%s','%s')", 
+sqlDyStringPrintf(update, "insert into %s values ( '%s','%s')", 
 	tableName,  el->id,  el->ac);
 sqlUpdate(conn, update->string);
 freeDyString(&update);
 }
 
-void tfbsConsMapSaveToDbEscaped(struct sqlConnection *conn, struct tfbsConsMap *el, char *tableName, int updateSize)
-/* Save tfbsConsMap as a row to the table specified by tableName. 
- * As blob fields may be arbitrary size updateSize specifies the approx size.
- * of a string that would contain the entire query. Automatically 
- * escapes all simple strings (not arrays of string) but may be slower than tfbsConsMapSaveToDb().
- * For example automatically copies and converts: 
- * "autosql's features include" --> "autosql\'s features include" 
- * before inserting into database. */ 
-{
-struct dyString *update = newDyString(updateSize);
-char  *id, *ac;
-id = sqlEscapeString(el->id);
-ac = sqlEscapeString(el->ac);
-
-dyStringPrintf(update, "insert into %s values ( '%s','%s')", 
-	tableName,  id,  ac);
-sqlUpdate(conn, update->string);
-freeDyString(&update);
-freez(&id);
-freez(&ac);
-}
-
 struct tfbsConsMap *tfbsConsMapCommaIn(char **pS, struct tfbsConsMap *ret)
 /* Create a tfbsConsMap out of a comma separated string. 
  * This will fill in ret if non-null, otherwise will
  * return a new tfbsConsMap */
 {
 char *s = *pS;
 
 if (ret == NULL)
     AllocVar(ret);
 ret->id = sqlStringComma(&s);
 ret->ac = sqlStringComma(&s);
 *pS = s;
 return ret;
 }