e81403a315a24af601884b8a19e89bcecc92f267 galt Sat Dec 8 20:04:28 2018 -0800 Fixing hFindSplitTable and its use. Standard size, give real string size so no undetected overflows. Test result and abort if not found. Avoids SQL errors that otherwise will popup. Handles uninitialzed stack better for the output name. refs #22596. diff --git src/hg/hgc/dbRIP.c src/hg/hgc/dbRIP.c index 8a90938..cbc819d 100644 --- src/hg/hgc/dbRIP.c +++ src/hg/hgc/dbRIP.c @@ -144,42 +144,43 @@ unbiasedHeterozygosity = 2 * alleleFrequency * (1.0 - alleleFrequency); printf("<TH align=center>%.3f</TH>", unbiasedHeterozygosity); printf("</TR>\n"); printf("</TABLE>\n"); printf("</TD></TR></TABLE>\n"); } else printf("<B>Polymorphism Frequencies and Genotypes:</B> NA<BR>\n"); } void dbRIP(struct trackDb *tdb, char *item, char *itemForUrl) /* Put up dbRIP track info */ { struct sqlConnection *conn = hAllocConn(database); struct sqlResult *sr = NULL; -char table[64]; +char table[HDB_MAX_TABLE_STRING]; boolean hasBin; struct dbRIP *loadItem; struct dyString *query = newDyString(512); char **row; boolean firstTime = TRUE; int start = cartInt(cart, "o"); int itemCount = 0; genericHeader(tdb, item); -hFindSplitTable(database, seqName, tdb->table, table, &hasBin); +if (!hFindSplitTable(database, seqName, tdb->table, table, sizeof table, &hasBin)) + errAbort("track %s not found", tdb->table); sqlDyStringPrintf(query, "select * from %s where chrom = '%s' and ", table, seqName); hAddBinToQuery(winStart, winEnd, query); sqlDyStringPrintf(query, "name = '%s' and chromStart = %d", item, start); sr = sqlGetResult(conn, query->string); while ((row = sqlNextRow(sr)) != NULL) { if (firstTime) firstTime = FALSE; else htmlHorizontalLine(); ++itemCount; loadItem = dbRIPLoad(row+hasBin); printf("<B>Database ID:</B> %s<BR>\n", loadItem->name); printf("<B>Original ID:</B> %s<BR>\n", loadItem->originalId);