e424d781ddad6fa42f9e49fc0f15f9343017759e max Fri Oct 3 12:02:14 2014 -0700 fixing null pointer error that occurs in gbib using angie's suggested code changes in refs #14067, note 58, refs #11957 diff --git src/hg/lib/jksql.c src/hg/lib/jksql.c index 3ec4257..e4a341c 100644 --- src/hg/lib/jksql.c +++ src/hg/lib/jksql.c @@ -770,31 +770,31 @@ /* Return list of tables in database associated with conn. Optionally filter list with * given LIKE expression that can be NULL or string e.g. "LIKE 'snp%'". */ { struct slName *list = NULL; struct sqlConnection *cacheConn = sqlTableCacheFindConn(conn); if (cacheConn) list = sqlTableCacheQuery(cacheConn, likeExpr); else list = sqlListTablesForConn(conn, likeExpr); if (conn->failoverConn != NULL) { struct slName *failoverList = sqlListTablesForConn(conn->failoverConn, likeExpr); - slSortMergeUniq(list, failoverList, slNameCmp, slNameFree); + slSortMergeUniq(&list, failoverList, slNameCmp, slNameFree); } return list; } struct slName *sqlListTables(struct sqlConnection *sc) /* Return list of tables in database associated with conn. */ { return sqlListTablesLike(sc, NULL); } struct sqlResult *sqlDescribe(struct sqlConnection *conn, char *table) /* run the sql DESCRIBE command or get a cached table description and return the sql result */ { char query[1024];