080a160c7b9595d516c9c70e83689a09b60839d0 galt Mon Jun 3 12:16:53 2013 -0700 fix SQL Injection diff --git src/hg/lib/cnpSharpCutoff.c src/hg/lib/cnpSharpCutoff.c index f1402e7..12c7660 100644 --- src/hg/lib/cnpSharpCutoff.c +++ src/hg/lib/cnpSharpCutoff.c @@ -83,60 +83,39 @@ while ((row = sqlNextRow(sr)) != NULL) { el = cnpSharpCutoffLoad(row); slAddHead(&list, el); } slReverse(&list); sqlFreeResult(&sr); return list; } void cnpSharpCutoffSaveToDb(struct sqlConnection *conn, struct cnpSharpCutoff *el, char *tableName, int updateSize) /* Save cnpSharpCutoff 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 cnpSharpCutoffSaveToDbEscaped() */ + * 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,%g)", +sqlDyStringPrintf(update, "insert into %s values ( '%s',%u,%g)", tableName, el->sample, el->batch, el->value); sqlUpdate(conn, update->string); freeDyString(&update); } -void cnpSharpCutoffSaveToDbEscaped(struct sqlConnection *conn, struct cnpSharpCutoff *el, char *tableName, int updateSize) -/* Save cnpSharpCutoff 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 cnpSharpCutoffSaveToDb(). - * For example automatically copies and converts: - * "autosql's features include" --> "autosql\'s features include" - * before inserting into database. */ -{ -struct dyString *update = newDyString(updateSize); -char *sample; -sample = sqlEscapeString(el->sample); - -dyStringPrintf(update, "insert into %s values ( '%s',%u,%g)", - tableName, sample, el->batch , el->value ); -sqlUpdate(conn, update->string); -freeDyString(&update); -freez(&sample); -} struct cnpSharpCutoff *cnpSharpCutoffCommaIn(char **pS, struct cnpSharpCutoff *ret) /* Create a cnpSharpCutoff out of a comma separated string. * This will fill in ret if non-null, otherwise will * return a new cnpSharpCutoff */ { char *s = *pS; if (ret == NULL) AllocVar(ret); ret->sample = sqlStringComma(&s); ret->batch = sqlUnsignedComma(&s); ret->value = sqlFloatComma(&s); *pS = s; return ret;