080a160c7b9595d516c9c70e83689a09b60839d0 galt Mon Jun 3 12:16:53 2013 -0700 fix SQL Injection diff --git src/hg/lib/affyTranscriptome.c src/hg/lib/affyTranscriptome.c index d8009e2..aca35e6 100644 --- src/hg/lib/affyTranscriptome.c +++ src/hg/lib/affyTranscriptome.c @@ -99,69 +99,39 @@ while ((row = sqlNextRow(sr)) != NULL) { el = affyTranscriptomeLoad(row); slAddHead(&list, el); } slReverse(&list); sqlFreeResult(&sr); return list; } void affyTranscriptomeSaveToDb(struct sqlConnection *conn, struct affyTranscriptome *el, char *tableName, int updateSize) /* Save affyTranscriptome 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 affyTranscriptomeSaveToDbEscaped() */ + * 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',%u,%s,%s)", +sqlDyStringPrintf(update, "insert into %s values ( '%s',%u,%u,'%s',%u,'%s',%u,%s,%s)", tableName, el->chrom, el->chromStart, el->chromEnd, el->name, el->score, el->strand, el->sampleCount, el->samplePosition, el->sampleHeight); sqlUpdate(conn, update->string); freeDyString(&update); } -void affyTranscriptomeSaveToDbEscaped(struct sqlConnection *conn, struct affyTranscriptome *el, char *tableName, int updateSize) -/* Save affyTranscriptome 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 affyTranscriptomeSaveToDb(). - * 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, *strand, *samplePosition, *sampleHeight; -chrom = sqlEscapeString(el->chrom); -name = sqlEscapeString(el->name); -strand = sqlEscapeString(el->strand); -samplePosition = sqlEscapeString(el->samplePosition); -sampleHeight = sqlEscapeString(el->sampleHeight); - -dyStringPrintf(update, "insert into %s values ( '%s',%u,%u,'%s',%u,'%s',%u,'%s','%s')", - tableName, chrom, el->chromStart , el->chromEnd , name, el->score , strand, el->sampleCount , samplePosition, sampleHeight); -sqlUpdate(conn, update->string); -freeDyString(&update); -freez(&chrom); -freez(&name); -freez(&strand); -freez(&samplePosition); -freez(&sampleHeight); -} - struct affyTranscriptome *affyTranscriptomeCommaIn(char **pS, struct affyTranscriptome *ret) /* Create a affyTranscriptome out of a comma separated string. * This will fill in ret if non-null, otherwise will * return a new affyTranscriptome */ { char *s = *pS; int i; 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);