3003dd8639adc83e45ead18a948ab7e168e9e6cc jcasper Mon May 20 08:11:37 2019 -0700 More changes in response to code review, refs #23481 diff --git src/hg/lib/hicUi.c src/hg/lib/hicUi.c index 1f43682..a615188 100644 --- src/hg/lib/hicUi.c +++ src/hg/lib/hicUi.c @@ -61,32 +61,34 @@ if (sameOk(selected, meta->resolutions[i])) sanityCheck = 1; } if (!sanityCheck) selected = "Auto"; return selected; } void hicUiResolutionMenu(struct cart *cart, char *track, struct hicMeta *meta) /* Draw a menu to select which binSize to use for fetching data */ { char cartVar[1024]; char autoscale[10] = "Auto"; printf("<b>Resolution:</b> "); safef(cartVar, sizeof(cartVar), "%s.%s", track, HIC_RESOLUTION); -char **menu = calloc(meta->nRes+1, sizeof(char*)); -char **values = calloc(meta->nRes+1, sizeof(char*)); +char **menu = NULL; +AllocArray(menu, meta->nRes+1); +char **values = NULL; +AllocArray(values, meta->nRes+1); menu[0] = autoscale; values[0] = autoscale; int i; for (i=1; i<meta->nRes+1; i++) { char buffer[1024]; long long value = atoll(meta->resolutions[i-1]); sprintWithMetricBaseUnit(buffer, sizeof(buffer), value); menu[i] = cloneString(buffer); values[i] = cloneString(meta->resolutions[i-1]); } char *selected = hicUiFetchResolution(cart, track, meta); cgiMakeDropListWithVals(cartVar, menu, values, meta->nRes+1, selected); free(menu); }