080a160c7b9595d516c9c70e83689a09b60839d0
galt
  Mon Jun 3 12:16:53 2013 -0700
fix SQL Injection
diff --git src/hg/lib/affyAtlas.c src/hg/lib/affyAtlas.c
index 046eb52..1550a41 100644
--- src/hg/lib/affyAtlas.c
+++ src/hg/lib/affyAtlas.c
@@ -70,66 +70,39 @@
 while ((row = sqlNextRow(sr)) != NULL)
     {
     el = affyAtlasLoad(row);
     slAddHead(&list, el);
     }
 slReverse(&list);
 sqlFreeResult(&sr);
 return list;
 }
 
 void affyAtlasSaveToDb(struct sqlConnection *conn, struct affyAtlas *el, char *tableName, int updateSize)
 /* Save affyAtlas 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 affyAtlasSaveToDbEscaped() */
+ * 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',%f,'%s',%f,'%s')", 
+sqlDyStringPrintf(update, "insert into %s values ( '%s','%s',%f,'%s',%f,'%s')", 
 	tableName,  el->annName,  el->probeSet,  el->signal,  el->detection,  el->pval,  el->tissue);
 sqlUpdate(conn, update->string);
 freeDyString(&update);
 }
 
-void affyAtlasSaveToDbEscaped(struct sqlConnection *conn, struct affyAtlas *el, char *tableName, int updateSize)
-/* Save affyAtlas 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 affyAtlasSaveToDb().
- * For example automatically copies and converts: 
- * "autosql's features include" --> "autosql\'s features include" 
- * before inserting into database. */ 
-{
-struct dyString *update = newDyString(updateSize);
-char  *annName, *probeSet, *detection, *tissue;
-annName = sqlEscapeString(el->annName);
-probeSet = sqlEscapeString(el->probeSet);
-detection = sqlEscapeString(el->detection);
-tissue = sqlEscapeString(el->tissue);
-
-dyStringPrintf(update, "insert into %s values ( '%s','%s',%f,'%s',%f,'%s')", 
-	tableName,  annName,  probeSet, el->signal ,  detection, el->pval ,  tissue);
-sqlUpdate(conn, update->string);
-freeDyString(&update);
-freez(&annName);
-freez(&probeSet);
-freez(&detection);
-freez(&tissue);
-}
 
 struct affyAtlas *affyAtlasCommaIn(char **pS, struct affyAtlas *ret)
 /* Create a affyAtlas out of a comma separated string. 
  * This will fill in ret if non-null, otherwise will
  * return a new affyAtlas */
 {
 char *s = *pS;
 
 if (ret == NULL)
     AllocVar(ret);
 ret->annName = sqlStringComma(&s);
 ret->probeSet = sqlStringComma(&s);
 ret->signal = sqlFloatComma(&s);
 sqlFixedStringComma(&s, ret->detection, sizeof(ret->detection));
 ret->pval = sqlFloatComma(&s);