I think I've got it. The following patch (also posted on
Launchpad) fixes the bug on my system. I am posting it here
for review and testing.
There are two leaks I fixed:
1. ENDALL_LOOP did not free memory. Now it does.
2. If you return early from a list using the macro.h macros,
list memory is not freed. I added an END_LOOP_EARLY macro
to handle this. However, there are a few problems with
this approach:
a. It isn't obvious, especially to new devs, that you
need to prefix all early returns with this macro.
Plus, it's ugly.
b. It only works on 1-level-deep loops. Supporting double-
or higher nesting will be very difficult with the current
macro setup.
I dunno what should be done about this. For now, this works
and also drops pcb's increasing memory use for normal work.
(Maybe there are still leaks; I just haven't noticed yet.)
Anyway, this patch will work for now.
diff --git a/src/macro.h b/src/macro.h
index b61f673..efcec67 100644
--- a/src/macro.h
+++ b/src/macro.h
@@ -175,6 +175,8 @@ extern int mem_any_set (unsigned char *, int);
g_list_free (__copy); \
} while (0)
+#define END_LOOP_EARLY g_list_free (__copy);
+
#define STYLE_LOOP(top) do { \
GList *__copy = NULL; /* DUMMY */ \
Cardinal n; \
@@ -328,7 +330,11 @@ extern int mem_any_set (unsigned char *, int);
{ \
point = (polygon)-Points[n]
-#define ENDALL_LOOP }} while (0); }} while (0)
+#define ENDALL_LOOP } \
+ g_list_free (__copy);\
+} while (0); } \
+g_list_free (__copy); \
+ } while (0)
#defineALLPIN_LOOP(top)\
ELEMENT_LOOP(top); \
@@ -340,6 +346,7 @@ extern int mem_any_set (unsigned char *, int);
#defineALLLINE_LOOP(top) do{ \
Cardinall; \
+ GList *__copy = NULL; /* DUMMY */ \
LayerTypePtrlayer = (top)-Layer; \
for (l = 0; l max_copper_layer + 2; l++, layer++) \
{ \
@@ -347,6 +354,7 @@ extern int mem_any_set (unsigned char *, int);
#define ALLARC_LOOP(top) do { \
Cardinall; \
+ GList *__copy = NULL; /* DUMMY */ \
LayerTypePtrlayer = (top)-Layer; \
for (l =0; l max_copper_layer + 2; l++, layer++) \
{ \
@@ -354,6 +362,7 @@ extern int mem_any_set (unsigned char *, int);
#defineALLPOLYGON_LOOP(top)do {\
Cardinall; \
+ GList *__copy = NULL; /* DUMMY */ \
LayerTypePtrlayer = (top)-Layer; \
for (l = 0; l max_copper_layer + 2; l++, layer++) \
{ \
@@ -361,6 +370,7 @@ extern int mem_any_set (unsigned char *, int);
#defineCOPPERLINE_LOOP(top) do { \
Cardinall; \
+ GList *__copy = NULL; /* DUMMY */ \
LayerTypePtrlayer = (top)-Layer; \
for (l = 0; l max_copper_layer; l++, layer++) \
{ \
@@ -368,6 +378,7 @@ extern int mem_any_set (unsigned char *, int);
#define COPPERARC_LOOP(top) do { \
Cardinall; \
+ GList *__copy = NULL; /* DUMMY */ \
LayerTypePtrlayer = (top)-Layer; \
for (l =0; l max_copper_layer; l++, layer++) \
{ \
@@ -375,6 +386,7 @@ extern int mem_any_set (unsigned char *, int);
#defineCOPPERPOLYGON_LOOP(top) do { \
Cardinall; \
+ GList *__copy = NULL; /* DUMMY */ \
LayerTypePtrlayer = (top)-Layer; \
for (l = 0; l max_copper_layer; l++, layer++) \
{ \
@@ -382,6 +394,7 @@ extern int mem_any_set (unsigned char *, int);
#defineSILKLINE_LOOP(top) do { \
Cardinall; \
+ GList *__copy = NULL; /* DUMMY */ \
LayerTypePtrlayer = (top)-Layer; \
layer += max_copper_layer; \
for (l = 0; l 2; l++, layer++)\
@@ -390,6 +403,7 @@ extern int mem_any_set (unsigned char *, int);
#define SILKARC_LOOP(top) do { \
Cardinall; \
+ GList *__copy = NULL; /* DUMMY */ \
LayerTypePtrlayer = (top)-Layer; \
layer += max_copper_layer; \
for (l = 0; l 2; l++, layer++)\
@@ -398,6 +412,7 @@ extern int
