f57fc11d951807e19b20b5960e735fa50eaea279 braney Fri Jun 12 13:10:00 2026 -0700 Fix more warnings exposed by -O3 build across hg utils and errAbort Continuation of the -O3 cleanup: a full clean rebuild surfaced warnings in many programs whose objects had not been recompiled before. Most are the same mechanical patterns as the first batch (strncpy -> safecpy/memcpy, sprintf -> safef), plus a few that needed more thought: - errAbort.h: mark errAbort/vaErrAbort/errnoAbort/noWarnAbort as noreturn. They provably never return (longjmp or exit; the existing "to make compiler happy" exit(-1) in noWarnAbort confirms the intent), and this lets GCC prune the impossible null paths after an errAbort guard, fixing false-positive null-deref / overread warnings in mafAddIRows, mafAddIRowsStream and phyloPlace with no source change to those files. - altSplice.c (hgGene): real one-element stack buffer overflow. makeGrayShades writes shadesOfGray[maxShade+1], but the caller declared shadesOfGray[9] with maxShade=8. Grow the array to [10] (maxShade stays 8); behavior unchanged. - hgc.c bedPrintPos: ~60 callers pass a track-specific struct cast to (struct bed *) and read only its bed-compatible leading fields. At -O3 -Warray-bounds flags the casts because the real object is smaller than struct bed; the reads are safe by the bed-layout convention, so suppress -Warray-bounds around just that function. - mafsInRegion.c: chromFromSrc returns strchr(src,'.')+1, which GCC mis-sizes as a 0-byte region when handed to strcmp via sameString/differentString; suppress the false-positive -Wstringop-overread around extractMafs. - sanger22gtf.c, bottleneck.c: put the printf/fprintf in the else of the NULL guard so -Wformat-overflow (which runs before the noreturn-based pruning) can see the argument is non-null. safecpy/memcpy/safef conversions: basicBed already done earlier; here haplotypes (memcpy of the original pointer pun), gbToFaRa, motifSig, hgClonePos, featureBits, libScan, hgGoldGapGl, hgSoftPromoter, mafClick, mafAddQRows, hgc.c, stanToBedAndExpRecs, bedUp, faSplit, trfBig, splitFaIntoContigs, aladdin, ameme. A full clean tree now builds with no warnings at -O3. refs #37761 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> diff --git src/weblet/bottleneck/bottleneck.c src/weblet/bottleneck/bottleneck.c index 4fae28579ae..b1b89cdbce3 100644 --- src/weblet/bottleneck/bottleneck.c +++ src/weblet/bottleneck/bottleneck.c @@ -1,310 +1,311 @@ /* bottleneck - A server that helps slow down hyperactive web robots. */ #include "common.h" #include <sys/wait.h> #include "localmem.h" #include "linefile.h" #include "hash.h" #include "options.h" #include "portable.h" #include "internet.h" #include "net.h" int port = 17776; /* Default bottleneck port. */ char *host = "localhost"; /* Default host. */ int penalty = 75; /* Penalty in milliseconds per access. */ int recovery = 10; /* Recovery in milliseconds per second. */ struct cidr *subnet = NULL; /* Subnet as CIDR struct. */ void usage() /* Explain usage and exit. */ { errAbort( "bottleneck v2 - A server that helps slow down hyperactive web robots\n" "usage:\n" " bottleneck start\n" "Start up bottleneck server\n" " bottleneck query ip-address [count] [fraction]\n" "Ask bottleneck server how long to wait to service ip-address after imposing\n" "the specified fraction of the access penalty (default of 1.0)\n" " bottleneck list\n" "List accessing sites\n" " bottleneck set ip-address milliseconds\n" "Set current delay for given ip-address\n" "options:\n" " -port=XXXX - Use specific tcp/ip port. Default %d.\n" " -host=XXXXX - Use specific host. Default %s.\n" " -subnet=WWW.XXX.YYY.ZZZ Restrict access to subnet (example 192.168.255.255).\n" " Supports comma-separated list of IPv4 or IPv6 subnets in CIDR notation, for example 192.168.255.255/16\n" " -penalty=N - Penalty (in milliseconds) for each access, default %d\n" " -recovery=N - Amount to recover (in milliseconds) for each second\n" " between accesses. Default %d\n" "Note: penalty and recovery if moved from defaults should balance\n" "At the default settings, an equilibrium will be achieved when queries\n" "are spaced 7.5 seconds apart. At the default decay value, an accumulated\n" "delay of 15 seconds will take 25 minutes of idleness to decay back to zero.\n" , port, host, penalty, recovery ); } static struct optionSpec options[] = { {"port", OPTION_INT}, {"host", OPTION_STRING}, {"subnet", OPTION_STRING}, {"penalty", OPTION_INT}, {"recovery", OPTION_INT}, {NULL, 0}, }; struct tracker /* Keep track of IP addresses. */ { struct tracker *next; /* Next in list. */ char *name; /* Name (IP address). Not allocated here. */ time_t lastAccess; /* Time of last access. */ int curDelay; /* Current delay in 1000ths of second. */ int maxDelay; /* Maximum delay so far. */ int accessCount; /* Total number of accesses since started tracking. */ }; struct hash *trackerHash = NULL; /* Hash of all trackers. */ struct tracker *trackerList; /* List of all trackers. */ time_t now; /* Current time. */ struct tracker *trackerForIp(char *ip) /* Find tracker for given IP address. Make it up if it * doesn't already exist. */ { struct tracker *tracker = hashFindVal(trackerHash, ip); if (tracker == NULL) { lmAllocVar(trackerHash->lm, tracker); hashAddSaveName(trackerHash, ip, tracker, &tracker->name); tracker->lastAccess = now; tracker->curDelay = -penalty; slAddHead(&trackerList, tracker); } return tracker; } int calcDelay(struct tracker *tracker, double fraction) /* Figure out recommended delay. */ { int timeDiff = now - tracker->lastAccess; int delay; if (timeDiff < 0) timeDiff = 0; delay = tracker->curDelay + (int)(fraction*penalty) - timeDiff*recovery; if (delay < 0) delay = 0; return delay; } void returnList(int socket) /* Send list of all things tracked down socket. */ { struct tracker *tracker; char buf[256]; int timeDiff; safef(buf, sizeof(buf), "#IP_ADDRESS\thits\ttime\tmax\tcurrent"); netSendString(socket, buf); for (tracker = trackerList; tracker != NULL; tracker = tracker->next) { timeDiff = now - tracker->lastAccess; safef(buf, sizeof(buf), "%s\t%d\t%d\t%d\t%d", tracker->name, tracker->accessCount, timeDiff, tracker->maxDelay, calcDelay(tracker, 1.0)); if (!netSendString(socket, buf)) break; } netSendString(socket, ""); } void clearZombies() /* Clear any zombie processes */ { int stat; for (;;) { if (waitpid(-1, &stat, WNOHANG) <= 0) break; } } void forkOutList(int socket) /* Fork instance of self to send list of all things tracked * down socket. */ { if (fork() == 0) { returnList(socket); exit(0); } else { clearZombies(); } } void startServer() /* Start up bottleneck server. */ { int acceptor; subnet = internetParseSubnetCidr(optionVal("subnet", NULL)); trackerHash = newHash(18); acceptor = netAcceptingSocket(port, 64); for (;;) { struct tracker *tracker; int socket = netAcceptFrom(acceptor, subnet); char buf[256], *s; s = netGetString(socket, buf); if (s != NULL) { now = time(NULL); if (s[0] == '?') { if (s[1] == 0) forkOutList(socket); else { char *command = nextWord(&s); if (sameString(command, "?set")) { char *ip = nextWord(&s); char *millis = nextWord(&s); if (millis != NULL) { tracker = trackerForIp(ip); tracker->curDelay = atoi(millis) - penalty; tracker->lastAccess = now; } } } } else { char *ip = nextWord(&s); char *fraction = nextWord(&s); tracker = trackerForIp(ip); tracker->accessCount += 1; if (fraction != NULL) tracker->curDelay = calcDelay(tracker, atof(fraction)); else tracker->curDelay = calcDelay(tracker, 1.0); if (tracker->maxDelay < tracker->curDelay) tracker->maxDelay = tracker->curDelay; tracker->lastAccess = now; safef(buf, sizeof(buf), "%d", tracker->curDelay); netSendString(socket, buf); } } close(socket); } } void forkOffServer() /* Close standard file handles and fork to be a better daemon. */ { /* Close standard file handles. */ close(0); close(1); close(2); if (fork() == 0) { /* Execute daemon. */ startServer(); } } void queryServer(char *ip, int count, double fraction) /* Query bottleneck server - just for testing. * Main query is over ip port. */ { int i; char sendString[256]; safef(sendString, sizeof(sendString), "%s %f", ip, fraction); for (i=0; i<count; ++i) { int socket = netMustConnect(host, port); char buf[256], *s; netSendString(socket, sendString); s = netGetString(socket, buf); if (s == NULL) errAbort("Shut out by bottleneck server %s:%d", host, port); + else printf("%s millisecond delay recommended\n", s); close(socket); } } void setUser(char *ip, char *millis) /* Set user current delay. */ { int socket = netMustConnect(host, port); char buf[256]; safef(buf, sizeof(buf), "?set %s %s", ip, millis); netSendString(socket, buf); close(socket); } void listAll() /* Ask server for info on all IP addresses. */ { int socket = netMustConnect(host, port); char buf[256], *s; netSendString(socket, "?"); for (;;) { s = netGetString(socket, buf); if (s == NULL || s[0] == 0) break; printf("%s\n", buf); } close(socket); } int main(int argc, char *argv[]) /* Process command line. */ { char *command; optionInit(&argc, argv, options); if (argc < 2) usage(); port = optionInt("port", port); host = optionVal("host", host); penalty = optionInt("penalty", penalty); recovery = optionInt("recovery", recovery); command = argv[1]; if (sameString(command, "start")) { if (argc != 2) usage(); forkOffServer(); } else if (sameString(command, "query")) { int count = 1; if (argc > 3) count = atoi(argv[3]); double fraction = 1.0; if (argc > 4) fraction = atof(argv[4]); queryServer(argv[2], count, fraction); } else if (sameString(command, "list")) { listAll(); } else if (sameString(command, "set")) { if (argc != 4) usage(); setUser(argv[2], argv[3]); } else { usage(); } return 0; }