64 bit botches in games/music

64 bit botches in games/music

[Nick Owens]

[-- Attachment #1: Type: text/plain, Size: 128 bytes --]

attached is a proposed patch to fix pointer reallocs in jukefs, and to
fix chan size in playlistfs.

if it's ok i'll commit it.

[-- Attachment #2: music.diff --]
[-- Type: text/plain, Size: 2175 bytes --]

diff -r 12e494045696 sys/src/games/music/jukefs/parse.c
--- a/sys/src/games/music/jukefs/parse.c	Mon Feb 13 22:28:35 2017 +0100
+++ b/sys/src/games/music/jukefs/parse.c	Wed Feb 15 05:53:36 2017 -0800
@@ -275,7 +275,7 @@
 				catsetinit(&ot->categories, catnr++);
 				/* And make an entry in the catobjects table */
 				if(ncat <= ntoken){
-					catobjects = realloc(catobjects, (ntoken+1)*sizeof(Object*));
+					catobjects = realloc(catobjects, (ntoken+1)*sizeof(Object**));
 					while(ncat <= ntoken) catobjects[ncat++] = nil;
 				}
 				if(catobjects[ntoken] != nil)
@@ -436,7 +436,7 @@
 		 */
 		for(i = 0; i < parent->nchildren; i++)
 				if(parent->children[i] == child) return;
-		parent->children = realloc(parent->children, (i+1)*4);
+		parent->children = realloc(parent->children, (i+1)*sizeof(Object**));
 		parent->children[i] = child;
 		parent->nchildren++;
 		if(parent->type == Category && child->type == Category)
@@ -457,7 +457,7 @@
 		i = child->ncatparents;
 		if(0) fprint(2, "addcatparent %s parent %d type %d child %d type %d\n",where,
 			parent->tabno, parent->type, child->tabno, child->type);
-		child->catparents = realloc(child->catparents, (i+1)*4);
+		child->catparents = realloc(child->catparents, (i+1)*sizeof(Object**));
 		child->catparents[i] = parent;
 		child->ncatparents++;
 }
@@ -476,7 +476,7 @@
 //				if(child->catparents[i] == parent) return;
 		i = child->ncatparents;
 		fprint(2, "addcatparent parent %d child %d\n", parent->tabno, child->tabno);
-		child->catparents = realloc(child->catparents, (i+1)*4);
+		child->catparents = realloc(child->catparents, (i+1)*sizeof(Object**));
 		child->catparents[i] = parent;
 		child->ncatparents++;
 }
diff -r 12e494045696 sys/src/games/music/playlistfs/player.c
--- a/sys/src/games/music/playlistfs/player.c	Mon Feb 13 22:28:35 2017 +0100
+++ b/sys/src/games/music/playlistfs/player.c	Wed Feb 15 05:53:36 2017 -0800
@@ -356,7 +356,7 @@
 	for(i = 0; i < NSparebuf; i++)
 		sendp(spare, malloc(sizeof(Pacbuf)));
 
-	playc = chancreate(sizeof(Pmsg), 1);
+	playc = chancreate(sizeof(ulong), 1);
 	procrfork(decproc, nil, 32*1024, RFFDG);
 	procrfork(pcmproc, nil, 32*1024, RFFDG);
 }

Re: [9front] 64 bit botches in games/music

[cinap_lenrek]

this is wrong:

-					catobjects = realloc(catobjects, (ntoken+1)*sizeof(Object*));
+					catobjects = realloc(catobjects, (ntoken+1)*sizeof(Object**));

extern	Object	**catobjects;

^- this reads as "ARRAY OF POINTERS", so you want to use n * sizeof(Object*).

--
cinap

Re: [9front] 64 bit botches in games/music

[cinap_lenrek]

pushed.

--
cinap