dwindows: mac/dw.m comparison

comparison mac/dw.m @ 1764:5ffeea4a2a4b

Fixed a memory leak in the Mac box code, items were not being freed when destroyed. Also rewrote the box packing/unpacking code to avoid clang/Xcode warnings on Analyze.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Sat, 30 Jun 2012 18:34:19 +0000
parents	e4fcd1e81f0d
children	d81bebc5c8cc

comparison

equal deleted inserted replaced

-:d894f87387b2
+:5ffeea4a2a4b
 return self;
 }
 -(void)dealloc
 {
 UserData *root = userdata;
+if(box->items)
+free(box->items);
 free(box);
 _remove_userdata(&root, NULL, TRUE);
 dw_signal_disconnect_by_window(self);
 [super dealloc];
 }
 {
 this = item = [object scrollview];
 }
 /* Do some sanity bounds checking */
+if(!thisitem)
+thisbox->count = 0;
 if(index < 0)
 index = 0;
 if(index > thisbox->count)
 index = thisbox->count;
 /* Duplicate the existing data */
-tmpitem = malloc(sizeof(Item)*(thisbox->count+1));
+tmpitem = calloc(sizeof(Item), (thisbox->count+1));
 for(z=0;z<thisbox->count;z++)
 {
 if(z == index)
 x++;
 }
 /* Queue a redraw on the top-level window */
 _dw_redraw([view window], TRUE);
 /* Free the old data */
-if(thisbox->count)
+if(thisitem)
 free(thisitem);
 DW_MUTEX_UNLOCK;
 }
 /*
 if([parent isKindOfClass:[DWBox class]] || [parent isKindOfClass:[DWGroupBox class]])
 {
 id window = [object window];
 Box *thisbox = [parent box];
 int z, index = -1;
-Item *tmpitem, *thisitem = thisbox->items;
+Item *tmpitem = NULL, *thisitem = thisbox->items;
+if(!thisitem)
+thisbox->count = 0;
 for(z=0;z<thisbox->count;z++)
 {
 if(thisitem[z].hwnd == object)
 index = z;
 }
 [object retain];
 [object removeFromSuperview];
-tmpitem = malloc(sizeof(Item)*(thisbox->count-1));
+if(thisbox->count > 1)
-/* Copy all but the current entry to the new list */
-for(z=0;z<index;z++)
 {
-tmpitem[z] = thisitem[z];
+tmpitem = calloc(sizeof(Item), (thisbox->count-1));
-}
-for(z=index+1;z<thisbox->count;z++)
+/* Copy all but the current entry to the new list */
-{
+for(z=0;z<index;z++)
-tmpitem[z-1] = thisitem[z];
+{
+tmpitem[z] = thisitem[z];
+}
+for(z=index+1;z<thisbox->count;z++)
+{
+tmpitem[z-1] = thisitem[z];
+}
 }
 thisbox->items = tmpitem;
-free(thisitem);
+if(thisitem)
-thisbox->count--;
+free(thisitem);
+if(tmpitem)
+thisbox->count--;
+else
+thisbox->count = 0;
 /* Queue a redraw on the top-level window */
 _dw_redraw(window, TRUE);
 }
 }
 DW_MUTEX_UNLOCK;
 Box *thisbox = [parent box];
 if(thisbox && index > -1 && index < thisbox->count)
 {
 int z;
-Item *tmpitem, *thisitem = thisbox->items;
+Item *tmpitem = NULL, *thisitem = thisbox->items;
 object = thisitem[index].hwnd;
 if(object)
 {
 [object retain];
 [object removeFromSuperview];
 }
-tmpitem = malloc(sizeof(Item)*(thisbox->count-1));
+if(thisbox->count > 1)
-/* Copy all but the current entry to the new list */
-for(z=0;z<index;z++)
 {
-tmpitem[z] = thisitem[z];
+tmpitem = calloc(sizeof(Item), (thisbox->count-1));
-}
-for(z=index+1;z<thisbox->count;z++)
+/* Copy all but the current entry to the new list */
-{
+for(z=0;thisitem && z<index;z++)
-tmpitem[z-1] = thisitem[z];
+{
+tmpitem[z] = thisitem[z];
+}
+for(z=index+1;z<thisbox->count;z++)
+{
+tmpitem[z-1] = thisitem[z];
+}
 }
 thisbox->items = tmpitem;
-free(thisitem);
+if(thisitem)
-thisbox->count--;
+free(thisitem);
+if(tmpitem)
+thisbox->count--;
+else
+thisbox->count = 0;
 /* Queue a redraw on the top-level window */
 _dw_redraw(window, TRUE);
 }
 }
 DW_MUTEX_UNLOCK;
 if([parent isKindOfClass:[DWBox class]] || [parent isKindOfClass:[DWGroupBox class]])
 {
 id window = [object window];
 Box *thisbox = [parent box];
 int z, index = -1;
-Item *tmpitem, *thisitem = thisbox->items;
+Item *tmpitem = NULL, *thisitem = thisbox->items;
+if(!thisitem)
+thisbox->count = 0;
 for(z=0;z<thisbox->count;z++)
 {
 if(thisitem[z].hwnd == object)
 index = z;
 }
 return 0;
 }
 [object removeFromSuperview];
-tmpitem = malloc(sizeof(Item)*(thisbox->count-1));
+if(thisbox->count > 1)
-/* Copy all but the current entry to the new list */
-for(z=0;z<index;z++)
 {
-tmpitem[z] = thisitem[z];
+tmpitem = calloc(sizeof(Item), (thisbox->count-1));
+/* Copy all but the current entry to the new list */
+for(z=0;z<index;z++)
+{
+tmpitem[z] = thisitem[z];
+}
+for(z=index+1;z<thisbox->count;z++)
+{
+tmpitem[z-1] = thisitem[z];
+}
 }
-for(z=index+1;z<thisbox->count;z++)
-{
-tmpitem[z-1] = thisitem[z];
-}
 thisbox->items = tmpitem;
-free(thisitem);
+if(thisitem)
-thisbox->count--;
+free(thisitem);
+if(tmpitem)
+thisbox->count--;
+else
+thisbox->count = 0;
 /* Queue a redraw on the top-level window */
 _dw_redraw(window, TRUE);
 }
 }
 DW_MUTEX_UNLOCK;
 {
 if(FD_ISSET(array[z].fd, &rd))
 {
 if((bytesread = (int)read(array[z].fd, &command, 1)) < 1)
 {
-struct _seminfo *newarray;
+struct _seminfo *newarray = NULL;
 /* Remove this connection from the set */
-newarray = (struct _seminfo *)malloc(sizeof(struct _seminfo)*(connectcount-1));
+if(connectcount > 1)
-if(!z)
-memcpy(newarray, &array[1], sizeof(struct _seminfo)*(connectcount-1));
-else
 {
-memcpy(newarray, array, sizeof(struct _seminfo)*z);
+newarray = (struct _seminfo *)malloc(sizeof(struct _seminfo)*(connectcount-1));
-if(z!=(connectcount-1))
+if(!z)
-memcpy(&newarray[z], &array[z+1], sizeof(struct _seminfo)*(z-connectcount-1));
+memcpy(newarray, &array[1], sizeof(struct _seminfo)*(connectcount-1));
+else
+{
+memcpy(newarray, array, sizeof(struct _seminfo)*z);
+if(z!=(connectcount-1))
+memcpy(&newarray[z], &array[z+1], sizeof(struct _seminfo)*(z-connectcount-1));
+}
 }
 connectcount--;
 /* Replace old array with new one */
 free(array);

Mercurial > dwindows

comparison mac/dw.m @ 1764:5ffeea4a2a4b