080a160c7b9595d516c9c70e83689a09b60839d0 galt Mon Jun 3 12:16:53 2013 -0700 fix SQL Injection diff --git src/hg/lib/ucscRetroOrtho.c src/hg/lib/ucscRetroOrtho.c index fa6dcfe..ab66424 100644 --- src/hg/lib/ucscRetroOrtho.c +++ src/hg/lib/ucscRetroOrtho.c @@ -34,62 +34,39 @@ while ((row = sqlNextRow(sr)) != NULL) { el = ucscRetroOrthoLoad(row); slAddHead(&list, el); } slReverse(&list); sqlFreeResult(&sr); return list; } void ucscRetroOrthoSaveToDb(struct sqlConnection *conn, struct ucscRetroOrtho *el, char *tableName, int updateSize) /* Save ucscRetroOrtho 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 ucscRetroOrthoSaveToDbEscaped() */ + * 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',%d)", +sqlDyStringPrintf(update, "insert into %s values ( '%s','%s',%d)", tableName, el->name, el->db, el->overlap); sqlUpdate(conn, update->string); freeDyString(&update); } -void ucscRetroOrthoSaveToDbEscaped(struct sqlConnection *conn, struct ucscRetroOrtho *el, char *tableName, int updateSize) -/* Save ucscRetroOrtho 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 ucscRetroOrthoSaveToDb(). - * 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, *db; -name = sqlEscapeString(el->name); -db = sqlEscapeString(el->db); - -dyStringPrintf(update, "insert into %s values ( '%s','%s',%d)", - tableName, name, db, el->overlap); -sqlUpdate(conn, update->string); -freeDyString(&update); -freez(&name); -freez(&db); -} struct ucscRetroOrtho *ucscRetroOrthoLoad(char **row) /* Load a ucscRetroOrtho from row fetched with select * from ucscRetroOrtho * from database. Dispose of this with ucscRetroOrthoFree(). */ { struct ucscRetroOrtho *ret; AllocVar(ret); ret->name = cloneString(row[0]); ret->db = cloneString(row[1]); ret->overlap = sqlSigned(row[2]); return ret; } struct ucscRetroOrtho *ucscRetroOrthoLoadAll(char *fileName)