080a160c7b9595d516c9c70e83689a09b60839d0
galt
  Mon Jun 3 12:16:53 2013 -0700
fix SQL Injection
diff --git src/hg/lib/hapmapLd.c src/hg/lib/hapmapLd.c
index 91d9aee..8ebe0e8 100644
--- src/hg/lib/hapmapLd.c
+++ src/hg/lib/hapmapLd.c
@@ -93,68 +93,39 @@
 while ((row = sqlNextRow(sr)) != NULL)
     {
     el = hapmapLdLoad(row);
     slAddHead(&list, el);
     }
 slReverse(&list);
 sqlFreeResult(&sr);
 return list;
 }
 
 void hapmapLdSaveToDb(struct sqlConnection *conn, struct hapmapLd *el, char *tableName, int updateSize)
 /* Save hapmapLd 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 hapmapLdSaveToDbEscaped() */
+ * 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',%u,%u,'%s',%u,'%s','%s','%s')", 
+sqlDyStringPrintf(update, "insert into %s values ( '%s',%u,%u,'%s',%u,'%s','%s','%s')", 
 	tableName,  el->chrom,  el->chromStart,  el->chromEnd,  el->name,  el->score,  el->dprime,  el->rsquared,  el->lod);
 sqlUpdate(conn, update->string);
 freeDyString(&update);
 }
 
-void hapmapLdSaveToDbEscaped(struct sqlConnection *conn, struct hapmapLd *el, char *tableName, int updateSize)
-/* Save hapmapLd 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 hapmapLdSaveToDb().
- * For example automatically copies and converts: 
- * "autosql's features include" --> "autosql\'s features include" 
- * before inserting into database. */ 
-{
-struct dyString *update = newDyString(updateSize);
-char  *chrom, *name, *dprime, *rsquared, *lod;
-chrom = sqlEscapeString(el->chrom);
-name = sqlEscapeString(el->name);
-dprime = sqlEscapeString(el->dprime);
-rsquared = sqlEscapeString(el->rsquared);
-lod = sqlEscapeString(el->lod);
-
-dyStringPrintf(update, "insert into %s values ( '%s',%u,%u,'%s',%u,'%s','%s','%s')", 
-	tableName,  chrom, el->chromStart , el->chromEnd ,  name, el->score ,  dprime,  rsquared,  lod);
-sqlUpdate(conn, update->string);
-freeDyString(&update);
-freez(&chrom);
-freez(&name);
-freez(&dprime);
-freez(&rsquared);
-freez(&lod);
-}
 
 struct hapmapLd *hapmapLdCommaIn(char **pS, struct hapmapLd *ret)
 /* Create a hapmapLd out of a comma separated string. 
  * This will fill in ret if non-null, otherwise will
  * return a new hapmapLd */
 {
 char *s = *pS;
 
 if (ret == NULL)
     AllocVar(ret);
 ret->chrom = sqlStringComma(&s);
 ret->chromStart = sqlUnsignedComma(&s);
 ret->chromEnd = sqlUnsignedComma(&s);
 ret->name = sqlStringComma(&s);
 ret->score = sqlUnsignedComma(&s);