080a160c7b9595d516c9c70e83689a09b60839d0 galt Mon Jun 3 12:16:53 2013 -0700 fix SQL Injection diff --git src/hg/inc/snpMap.h src/hg/inc/snpMap.h index ed6543f..7ceb4c4 100644 --- src/hg/inc/snpMap.h +++ src/hg/inc/snpMap.h @@ -43,42 +43,31 @@ /* Load all snpMap from tab separated file. * Dispose of this with snpMapFreeList(). */ struct snpMap *snpMapLoadByQuery(struct sqlConnection *conn, char *query); /* Load all snpMap from table that satisfy the query given. * Where query is of the form 'select * from example where something=something' * or 'select example.* from example, anotherTable where example.something = * anotherTable.something'. * Dispose of this with snpMapFreeList(). */ void snpMapSaveToDb(struct sqlConnection *conn, struct snpMap *el, char *tableName, int updateSize); /* Save snpMap 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 snpMapSaveToDbEscaped() */ - -void snpMapSaveToDbEscaped(struct sqlConnection *conn, struct snpMap *el, char *tableName, int updateSize); -/* Save snpMap 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 snpMapSaveToDb(). - * For example automatically copies and converts: - * "autosql's features include" --> "autosql\'s features include" - * before inserting into database. */ + * inserted as NULL. Strings are automatically escaped to allow insertion into the database. */ struct snpMap *snpMapCommaIn(char **pS, struct snpMap *ret); /* Create a snpMap out of a comma separated string. * This will fill in ret if non-null, otherwise will * return a new snpMap */ void snpMapFree(struct snpMap **pEl); /* Free a single dynamically allocated snpMap such as created * with snpMapLoad(). */ void snpMapFreeList(struct snpMap **pList); /* Free a list of dynamically allocated snpMap's */ void snpMapOutput(struct snpMap *el, FILE *f, char sep, char lastSep); /* Print out snpMap. Separate fields with sep. Follow last field with lastSep. */