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