src/hg/hgTracks/imageV2.c 1.20
1.20 2010/02/03 18:43:37 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/imageV2.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTracks/imageV2.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -b -B -U 4 -r1.19 -r1.20
--- src/hg/hgTracks/imageV2.c 17 Dec 2009 19:20:24 -0000 1.19
+++ src/hg/hgTracks/imageV2.c 3 Feb 2010 18:43:37 -0000 1.20
@@ -29,9 +29,9 @@
{
struct flatTracks *flatTrack;
AllocVar(flatTrack);
flatTrack->track = track;
-char var[128]; // The whole reason to do this is to reorder tracks/subtracks in the image!
+char var[256]; // The whole reason to do this is to reorder tracks/subtracks in the image!
safef(var,sizeof(var),"%s_%s",track->tdb->tableName,IMG_ORDER_VAR);
flatTrack->order = cartUsualInt(cart, var,IMG_ANYORDER);
if(flatTrack->order >= IMG_ORDEREND)
{
@@ -420,9 +420,9 @@
{
warn("sliceAddMap() but slice already has its own map. Being replaced.");
mapSetFree(&(slice->map));
}
-char qualifiedName[128];
+char qualifiedName[256];
safef(qualifiedName,sizeof(qualifiedName),"%s_%s",sliceTypeToString(slice->type),name);
slice->map = mapSetStart(qualifiedName,slice->parentImg,linkRoot);
return slice->map;
}
@@ -450,9 +450,9 @@
{
struct mapSet *map = sliceGetMap(slice,TRUE); // Must be specific to this slice
if (map == NULL)
return sliceMapStart(slice,name,linkRoot);
-char qualifiedName[128];
+char qualifiedName[256];
safef(qualifiedName,sizeof(qualifiedName),"%s_%s",sliceTypeToString(slice->type),name);
return mapSetUpdate(map,qualifiedName,slice->parentImg,linkRoot);
}
@@ -1315,9 +1315,9 @@
return;
boolean verbose = (hIsPrivateHost()); // Warnings for hgwdev only
if(!imgBoxIsComplete(imgBox,verbose))
return;
-char name[128];
+char name[256];
int bgOffset = NO_VALUE;
imgBoxTracksNormalizeOrder(imgBox);