src/hg/hgTracks/hgTracks.c 1.1621
1.1621 2010/02/03 18:43:38 angie
Increased some char[] sizes that caused safef errors with custom track with name longer than 128, and some others that looked like they might.
Index: src/hg/hgTracks/hgTracks.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTracks/hgTracks.c,v
retrieving revision 1.1620
retrieving revision 1.1621
diff -b -B -U 4 -r1.1620 -r1.1621
--- src/hg/hgTracks/hgTracks.c 8 Jan 2010 23:50:44 -0000 1.1620
+++ src/hg/hgTracks/hgTracks.c 3 Feb 2010 18:43:38 -0000 1.1621
@@ -291,9 +291,9 @@
{
char link[512];
safef(link,sizeof(link),"%s?%s=%u&g=%s",
hgTrackUiName(), cartSessionVarName(),cartSessionId(cart), encodedName);
- char title[128];
+ char title[256];
safef(title,sizeof(title),"%s controls", shortLabel);
struct imgSlice *curSlice = imgTrackSliceGetByType(curImgTrack,stButton);
sliceAddLink(curSlice,link,title);
@@ -1033,10 +1033,10 @@
int ymin, ymax;
int start;
int newy;
-char o4[128];
-char o5[128];
+char o4[256];
+char o5[256];
struct slList *item;
enum trackVisibility vis = track->limitedVis;
enum trackVisibility savedVis = vis;
Color labelColor = (track->labelColor ?
@@ -1237,9 +1237,9 @@
{
int arrowWidth = insideHeight;
int arrowButtonWidth = arrowWidth + 2 * NEXT_ITEM_ARROW_BUFFER;
int rightButtonX = insideX + insideWidth - arrowButtonWidth - 1;
-char buttonText[100];
+char buttonText[256];
Color fillColor = lightGrayIndex();
labelColor = blackIndex();
hvGfxNextItemButton(hvg, rightButtonX + NEXT_ITEM_ARROW_BUFFER, y, arrowWidth, arrowWidth, labelColor, fillColor, TRUE);
hvGfxNextItemButton(hvg, insideX + NEXT_ITEM_ARROW_BUFFER, y, arrowWidth, arrowWidth, labelColor, fillColor, FALSE);
@@ -2033,9 +2033,9 @@
{
#ifdef FLAT_TRACK_LIST
int order = flatTrack->order;
#else//ifndef FLAT_TRACK_LIST
- char var[128];
+ char var[256];
safef(var,sizeof(var),"%s_%s",track->tdb->tableName,IMG_ORDER_VAR);
int order = cartUsualInt(cart, var,IMG_ANYORDER);
#endif//ndef FLAT_TRACK_LIST
curImgTrack = imgBoxTrackFindOrAdd(theImgBox,track->tdb,NULL,track->limitedVis,isWithCenterLabels(track),order);
@@ -2710,9 +2710,9 @@
static int getScoreFilter(char *tableName)
/* check for score filter configuration setting */
{
-char optionScoreStr[128];
+char optionScoreStr[256];
safef(optionScoreStr, sizeof(optionScoreStr), "%s.scoreFilter", tableName);
return cartUsualInt(cart, optionScoreStr, 0);
}
@@ -3207,9 +3207,9 @@
struct hashEl *visEl;
struct hashEl *visList = cartFindPrefix(cart, "hgtct.");
for (visEl = visList; visEl != NULL; visEl = visEl->next)
{
- char buf[128];
+ char buf[256];
safef(buf, sizeof buf, "browser %s %s", cartString(cart, visEl->name),
chopPrefix(cloneString(visEl->name)));
slAddTail(&browserLines, slNameNew(buf));
cartRemove(cart, visEl->name);
@@ -3698,9 +3698,9 @@
/* handle track reordering feature -- change group assigned to track */
if (withPriorityOverride)
{
char *groupName = NULL;
- char cartVar[128];
+ char cartVar[256];
/* belt and suspenders -- accomodate inconsistent track/trackDb
* creation. Note -- with code cleanup, these default variables
* could be retired, and the tdb versions used as defaults */
@@ -3819,9 +3819,9 @@
superTrack->groupName = cloneString(group->name);
superTrack->defaultGroupName = cloneString(group->name);
/* handle track reordering */
- char cartVar[128];
+ char cartVar[256];
safef(cartVar, sizeof(cartVar), "%s.priority",track->tdb->parentName);
float priority = (float)cartUsualDouble(cart, cartVar,
track->tdb->parent->priority);
/* remove cart variables that are the same as the trackDb settings */
@@ -3947,9 +3947,9 @@
char *collapseGroupVar(char *name)
/* Construct cart variable name for collapsing group */
{
-static char varName[128];
+static char varName[256];
safef(varName, sizeof(varName),
"%s%s_%s_%s", "hgt", "group", name, "close");
return (cloneString(varName));
}