080a160c7b9595d516c9c70e83689a09b60839d0
galt
  Mon Jun 3 12:16:53 2013 -0700
fix SQL Injection
diff --git src/hg/lib/taxonNode.c src/hg/lib/taxonNode.c
index dd9d077..d062e07 100644
--- src/hg/lib/taxonNode.c
+++ src/hg/lib/taxonNode.c
@@ -103,64 +103,39 @@
 while ((row = sqlNextRow(sr)) != NULL)
     {
     el = taxonNodeLoad(row);
     slAddHead(&list, el);
     }
 slReverse(&list);
 sqlFreeResult(&sr);
 return list;
 }
 
 void taxonNodeSaveToDb(struct sqlConnection *conn, struct taxonNode *el, char *tableName, int updateSize)
 /* Save taxonNode 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 taxonNodeSaveToDbEscaped() */
+ * inserted as NULL. Strings are automatically escaped to allow insertion into the database. */
 {
 struct dyString *update = newDyString(updateSize);
-dyStringPrintf(update, "insert into %s values ( %u,%u,'%s','%s',%u,%u,%u,%u,%u,%u,%u,%u,'%s')", 
+sqlDyStringPrintf(update, "insert into %s values ( %u,%u,'%s','%s',%u,%u,%u,%u,%u,%u,%u,%u,'%s')", 
 	tableName,  el->taxon,  el->parent,  el->rank,  el->emblcode,  el->division,  el->inheritedDiv,  el->geneticCode,  el->inheritedGC,  el->mitoGeneticCode,  el->inheritedMitoGC,  el->GenBankHidden,  el->notSequenced,  el->comments);
 sqlUpdate(conn, update->string);
 freeDyString(&update);
 }
 
-void taxonNodeSaveToDbEscaped(struct sqlConnection *conn, struct taxonNode *el, char *tableName, int updateSize)
-/* Save taxonNode 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 taxonNodeSaveToDb().
- * For example automatically copies and converts: 
- * "autosql's features include" --> "autosql\'s features include" 
- * before inserting into database. */ 
-{
-struct dyString *update = newDyString(updateSize);
-char  *rank, *emblcode, *comments;
-rank = sqlEscapeString(el->rank);
-emblcode = sqlEscapeString(el->emblcode);
-comments = sqlEscapeString(el->comments);
-
-dyStringPrintf(update, "insert into %s values ( %u,%u,'%s','%s',%u,%u,%u,%u,%u,%u,%u,%u,'%s')", 
-	tableName, el->taxon , el->parent ,  rank,  emblcode, el->division , el->inheritedDiv , el->geneticCode , el->inheritedGC , el->mitoGeneticCode , el->inheritedMitoGC , el->GenBankHidden , el->notSequenced ,  comments);
-sqlUpdate(conn, update->string);
-freeDyString(&update);
-freez(&rank);
-freez(&emblcode);
-freez(&comments);
-}
 
 struct taxonNode *taxonNodeCommaIn(char **pS, struct taxonNode *ret)
 /* Create a taxonNode out of a comma separated string. 
  * This will fill in ret if non-null, otherwise will
  * return a new taxonNode */
 {
 char *s = *pS;
 
 if (ret == NULL)
     AllocVar(ret);
 ret->taxon = sqlUnsignedComma(&s);
 ret->parent = sqlUnsignedComma(&s);
 ret->rank = sqlStringComma(&s);
 ret->emblcode = sqlStringComma(&s);
 ret->division = sqlUnsignedComma(&s);