[PATCH 12/28] wmgeneral: Don't call free on pointers we haven't malloced.

[Doug Torrance]

Could cause occasional segfaults.
---
 wmSMPmon/wmgeneral/wmgeneral.c  | 4 ----
 wmckgmail/wmgeneral/wmgeneral.c | 4 ----
 wmcpufreq/wmgeneral/wmgeneral.c | 4 ----
 wmfsm/wmgeneral/wmgeneral.c     | 4 ----
 wmifs/wmgeneral/wmgeneral.c     | 4 ----
 wmitime/wmgeneral/wmgeneral.c   | 4 ----
 wmkeys/wmgeneral/wmgeneral.c    | 4 ----
 wmmon/wmgeneral/wmgeneral.c     | 4 ----
 wmppp.app/wmgeneral/wmgeneral.c | 4 ----
 wmsm.app/wmgeneral/wmgeneral.c  | 4 ----
 wmtime/wmgeneral/wmgeneral.c    | 4 ----
 wmtz/wmgeneral/wmgeneral.c      | 4 ----
 12 files changed, 48 deletions(-)

diff --git a/wmSMPmon/wmgeneral/wmgeneral.c b/wmSMPmon/wmgeneral/wmgeneral.c
index 436b196..7405123 100644
--- a/wmSMPmon/wmgeneral/wmgeneral.c
+++ b/wmSMPmon/wmgeneral/wmgeneral.c
@@ -141,12 +141,10 @@ void parse_rcfile(const char *filename, rckeys *keys) {
                                        p += strlen(keys[key].label);
                                        p += strspn(p, tokens);
                                        if ((i = strcspn(p, "#\n"))) p[i] = 
'\0';
-                                       free(*keys[key].var);
                                        *keys[key].var = strdup(p);
                                        key = -1;
                                } else key++;
                        }
-                       free(q);
                }
                fclose(fp);
        }
@@ -178,7 +176,6 @@ void parse_rcfile2(const char *filename, rckeys2 *keys) {
                                        p += strlen(keys[key].label);
                                        p += strspn(p, tokens);
                                        if ((i = strcspn(p, "#\n"))) p[i] = 0;
-                                       free(*keys[key].var);
                                        *keys[key].var = strdup(p);
                                        key = -1;
                                } else key++;
@@ -186,7 +183,6 @@ void parse_rcfile2(const char *filename, rckeys2 *keys) {
                }
                fclose(fp);
        }
-       free(family);
 }
 
 
diff --git a/wmckgmail/wmgeneral/wmgeneral.c b/wmckgmail/wmgeneral/wmgeneral.c
index 436b196..7405123 100644
--- a/wmckgmail/wmgeneral/wmgeneral.c
+++ b/wmckgmail/wmgeneral/wmgeneral.c
@@ -141,12 +141,10 @@ void parse_rcfile(const char *filename, rckeys *keys) {
                                        p += strlen(keys[key].label);
                                        p += strspn(p, tokens);
                                        if ((i = strcspn(p, "#\n"))) p[i] = 
'\0';
-                                       free(*keys[key].var);
                                        *keys[key].var = strdup(p);
                                        key = -1;
                                } else key++;
                        }
-                       free(q);
                }
                fclose(fp);
        }
@@ -178,7 +176,6 @@ void parse_rcfile2(const char *filename, rckeys2 *keys) {
                                        p += strlen(keys[key].label);
                                        p += strspn(p, tokens);
                                        if ((i = strcspn(p, "#\n"))) p[i] = 0;
-                                       free(*keys[key].var);
                                        *keys[key].var = strdup(p);
                                        key = -1;
                                } else key++;
@@ -186,7 +183,6 @@ void parse_rcfile2(const char *filename, rckeys2 *keys) {
                }
                fclose(fp);
        }
-       free(family);
 }
 
 
diff --git a/wmcpufreq/wmgeneral/wmgeneral.c b/wmcpufreq/wmgeneral/wmgeneral.c
index 436b196..7405123 100755
--- a/wmcpufreq/wmgeneral/wmgeneral.c
+++ b/wmcpufreq/wmgeneral/wmgeneral.c
@@ -141,12 +141,10 @@ void parse_rcfile(const char *filename, rckeys *keys) {
                                        p += strlen(keys[key].label);
                                        p += strspn(p, tokens);
                                        if ((i = strcspn(p, "#\n"))) p[i] = 
'\0';
-                                       free(*keys[key].var);
                                        *keys[key].var = strdup(p);
                                        key = -1;
                                } else key++;
                        }
-                       free(q);
                }
                fclose(fp);
        }
@@ -178,7 +176,6 @@ void parse_rcfile2(const char *filename, rckeys2 *keys) {
                                        p += strlen(keys[key].label);
                                        p += strspn(p, tokens);
                                        if ((i = strcspn(p, "#\n"))) p[i] = 0;
-                                       free(*keys[key].var);
                                        *keys[key].var = strdup(p);
                                        key = -1;
                                } else key++;
@@ -186,7 +183,6 @@ void parse_rcfile2(const char *filename, rckeys2 *keys) {
                }
                fclose(fp);
        }
-       free(family);
 }
 
 
diff --git a/wmfsm/wmgeneral/wmgeneral.c b/wmfsm/wmgeneral/wmgeneral.c
index 436b196..7405123 100644
--- a/wmfsm/wmgeneral/wmgeneral.c
+++ b/wmfsm/wmgeneral/wmgeneral.c
@@ -141,12 +141,10 @@ void parse_rcfile(const char *filename, rckeys *keys) {
                                        p += strlen(keys[key].label);
                                        p += strspn(p, tokens);
                                        if ((i = strcspn(p, "#\n"))) p[i] = 
'\0';
-                                       free(*keys[key].var);
                                        *keys[key].var = strdup(p);
                                        key = -1;
                                } else key++;
                        }
-                       free(q);
                }
                fclose(fp);
        }
@@ -178,7 +176,6 @@ void parse_rcfile2(const char *filename, rckeys2 *keys) {
                                        p += strlen(keys[key].label);
                                        p += strspn(p, tokens);
                                        if ((i = strcspn(p, "#\n"))) p[i] = 0;
-                                       free(*keys[key].var);
                                        *keys[key].var = strdup(p);
                                        key = -1;
                                } else key++;
@@ -186,7 +183,6 @@ void parse_rcfile2(const char *filename, rckeys2 *keys) {
                }
                fclose(fp);
        }
-       free(family);
 }
 
 
diff --git a/wmifs/wmgeneral/wmgeneral.c b/wmifs/wmgeneral/wmgeneral.c
index 436b196..7405123 100644
--- a/wmifs/wmgeneral/wmgeneral.c
+++ b/wmifs/wmgeneral/wmgeneral.c
@@ -141,12 +141,10 @@ void parse_rcfile(const char *filename, rckeys *keys) {
                                        p += strlen(keys[key].label);
                                        p += strspn(p, tokens);
                                        if ((i = strcspn(p, "#\n"))) p[i] = 
'\0';
-                                       free(*keys[key].var);
                                        *keys[key].var = strdup(p);
                                        key = -1;
                                } else key++;
                        }
-                       free(q);
                }
                fclose(fp);
        }
@@ -178,7 +176,6 @@ void parse_rcfile2(const char *filename, rckeys2 *keys) {
                                        p += strlen(keys[key].label);
                                        p += strspn(p, tokens);
                                        if ((i = strcspn(p, "#\n"))) p[i] = 0;
-                                       free(*keys[key].var);
                                        *keys[key].var = strdup(p);
                                        key = -1;
                                } else key++;
@@ -186,7 +183,6 @@ void parse_rcfile2(const char *filename, rckeys2 *keys) {
                }
                fclose(fp);
        }
-       free(family);
 }
 
 
diff --git a/wmitime/wmgeneral/wmgeneral.c b/wmitime/wmgeneral/wmgeneral.c
index 436b196..7405123 100644
--- a/wmitime/wmgeneral/wmgeneral.c
+++ b/wmitime/wmgeneral/wmgeneral.c
@@ -141,12 +141,10 @@ void parse_rcfile(const char *filename, rckeys *keys) {
                                        p += strlen(keys[key].label);
                                        p += strspn(p, tokens);
                                        if ((i = strcspn(p, "#\n"))) p[i] = 
'\0';
-                                       free(*keys[key].var);
                                        *keys[key].var = strdup(p);
                                        key = -1;
                                } else key++;
                        }
-                       free(q);
                }
                fclose(fp);
        }
@@ -178,7 +176,6 @@ void parse_rcfile2(const char *filename, rckeys2 *keys) {
                                        p += strlen(keys[key].label);
                                        p += strspn(p, tokens);
                                        if ((i = strcspn(p, "#\n"))) p[i] = 0;
-                                       free(*keys[key].var);
                                        *keys[key].var = strdup(p);
                                        key = -1;
                                } else key++;
@@ -186,7 +183,6 @@ void parse_rcfile2(const char *filename, rckeys2 *keys) {
                }
                fclose(fp);
        }
-       free(family);
 }
 
 
diff --git a/wmkeys/wmgeneral/wmgeneral.c b/wmkeys/wmgeneral/wmgeneral.c
index 436b196..7405123 100644
--- a/wmkeys/wmgeneral/wmgeneral.c
+++ b/wmkeys/wmgeneral/wmgeneral.c
@@ -141,12 +141,10 @@ void parse_rcfile(const char *filename, rckeys *keys) {
                                        p += strlen(keys[key].label);
                                        p += strspn(p, tokens);
                                        if ((i = strcspn(p, "#\n"))) p[i] = 
'\0';
-                                       free(*keys[key].var);
                                        *keys[key].var = strdup(p);
                                        key = -1;
                                } else key++;
                        }
-                       free(q);
                }
                fclose(fp);
        }
@@ -178,7 +176,6 @@ void parse_rcfile2(const char *filename, rckeys2 *keys) {
                                        p += strlen(keys[key].label);
                                        p += strspn(p, tokens);
                                        if ((i = strcspn(p, "#\n"))) p[i] = 0;
-                                       free(*keys[key].var);
                                        *keys[key].var = strdup(p);
                                        key = -1;
                                } else key++;
@@ -186,7 +183,6 @@ void parse_rcfile2(const char *filename, rckeys2 *keys) {
                }
                fclose(fp);
        }
-       free(family);
 }
 
 
diff --git a/wmmon/wmgeneral/wmgeneral.c b/wmmon/wmgeneral/wmgeneral.c
index 436b196..7405123 100644
--- a/wmmon/wmgeneral/wmgeneral.c
+++ b/wmmon/wmgeneral/wmgeneral.c
@@ -141,12 +141,10 @@ void parse_rcfile(const char *filename, rckeys *keys) {
                                        p += strlen(keys[key].label);
                                        p += strspn(p, tokens);
                                        if ((i = strcspn(p, "#\n"))) p[i] = 
'\0';
-                                       free(*keys[key].var);
                                        *keys[key].var = strdup(p);
                                        key = -1;
                                } else key++;
                        }
-                       free(q);
                }
                fclose(fp);
        }
@@ -178,7 +176,6 @@ void parse_rcfile2(const char *filename, rckeys2 *keys) {
                                        p += strlen(keys[key].label);
                                        p += strspn(p, tokens);
                                        if ((i = strcspn(p, "#\n"))) p[i] = 0;
-                                       free(*keys[key].var);
                                        *keys[key].var = strdup(p);
                                        key = -1;
                                } else key++;
@@ -186,7 +183,6 @@ void parse_rcfile2(const char *filename, rckeys2 *keys) {
                }
                fclose(fp);
        }
-       free(family);
 }
 
 
diff --git a/wmppp.app/wmgeneral/wmgeneral.c b/wmppp.app/wmgeneral/wmgeneral.c
index 436b196..7405123 100644
--- a/wmppp.app/wmgeneral/wmgeneral.c
+++ b/wmppp.app/wmgeneral/wmgeneral.c
@@ -141,12 +141,10 @@ void parse_rcfile(const char *filename, rckeys *keys) {
                                        p += strlen(keys[key].label);
                                        p += strspn(p, tokens);
                                        if ((i = strcspn(p, "#\n"))) p[i] = 
'\0';
-                                       free(*keys[key].var);
                                        *keys[key].var = strdup(p);
                                        key = -1;
                                } else key++;
                        }
-                       free(q);
                }
                fclose(fp);
        }
@@ -178,7 +176,6 @@ void parse_rcfile2(const char *filename, rckeys2 *keys) {
                                        p += strlen(keys[key].label);
                                        p += strspn(p, tokens);
                                        if ((i = strcspn(p, "#\n"))) p[i] = 0;
-                                       free(*keys[key].var);
                                        *keys[key].var = strdup(p);
                                        key = -1;
                                } else key++;
@@ -186,7 +183,6 @@ void parse_rcfile2(const char *filename, rckeys2 *keys) {
                }
                fclose(fp);
        }
-       free(family);
 }
 
 
diff --git a/wmsm.app/wmgeneral/wmgeneral.c b/wmsm.app/wmgeneral/wmgeneral.c
index 436b196..7405123 100644
--- a/wmsm.app/wmgeneral/wmgeneral.c
+++ b/wmsm.app/wmgeneral/wmgeneral.c
@@ -141,12 +141,10 @@ void parse_rcfile(const char *filename, rckeys *keys) {
                                        p += strlen(keys[key].label);
                                        p += strspn(p, tokens);
                                        if ((i = strcspn(p, "#\n"))) p[i] = 
'\0';
-                                       free(*keys[key].var);
                                        *keys[key].var = strdup(p);
                                        key = -1;
                                } else key++;
                        }
-                       free(q);
                }
                fclose(fp);
        }
@@ -178,7 +176,6 @@ void parse_rcfile2(const char *filename, rckeys2 *keys) {
                                        p += strlen(keys[key].label);
                                        p += strspn(p, tokens);
                                        if ((i = strcspn(p, "#\n"))) p[i] = 0;
-                                       free(*keys[key].var);
                                        *keys[key].var = strdup(p);
                                        key = -1;
                                } else key++;
@@ -186,7 +183,6 @@ void parse_rcfile2(const char *filename, rckeys2 *keys) {
                }
                fclose(fp);
        }
-       free(family);
 }
 
 
diff --git a/wmtime/wmgeneral/wmgeneral.c b/wmtime/wmgeneral/wmgeneral.c
index 436b196..7405123 100644
--- a/wmtime/wmgeneral/wmgeneral.c
+++ b/wmtime/wmgeneral/wmgeneral.c
@@ -141,12 +141,10 @@ void parse_rcfile(const char *filename, rckeys *keys) {
                                        p += strlen(keys[key].label);
                                        p += strspn(p, tokens);
                                        if ((i = strcspn(p, "#\n"))) p[i] = 
'\0';
-                                       free(*keys[key].var);
                                        *keys[key].var = strdup(p);
                                        key = -1;
                                } else key++;
                        }
-                       free(q);
                }
                fclose(fp);
        }
@@ -178,7 +176,6 @@ void parse_rcfile2(const char *filename, rckeys2 *keys) {
                                        p += strlen(keys[key].label);
                                        p += strspn(p, tokens);
                                        if ((i = strcspn(p, "#\n"))) p[i] = 0;
-                                       free(*keys[key].var);
                                        *keys[key].var = strdup(p);
                                        key = -1;
                                } else key++;
@@ -186,7 +183,6 @@ void parse_rcfile2(const char *filename, rckeys2 *keys) {
                }
                fclose(fp);
        }
-       free(family);
 }
 
 
diff --git a/wmtz/wmgeneral/wmgeneral.c b/wmtz/wmgeneral/wmgeneral.c
index 436b196..7405123 100644
--- a/wmtz/wmgeneral/wmgeneral.c
+++ b/wmtz/wmgeneral/wmgeneral.c
@@ -141,12 +141,10 @@ void parse_rcfile(const char *filename, rckeys *keys) {
                                        p += strlen(keys[key].label);
                                        p += strspn(p, tokens);
                                        if ((i = strcspn(p, "#\n"))) p[i] = 
'\0';
-                                       free(*keys[key].var);
                                        *keys[key].var = strdup(p);
                                        key = -1;
                                } else key++;
                        }
-                       free(q);
                }
                fclose(fp);
        }
@@ -178,7 +176,6 @@ void parse_rcfile2(const char *filename, rckeys2 *keys) {
                                        p += strlen(keys[key].label);
                                        p += strspn(p, tokens);
                                        if ((i = strcspn(p, "#\n"))) p[i] = 0;
-                                       free(*keys[key].var);
                                        *keys[key].var = strdup(p);
                                        key = -1;
                                } else key++;
@@ -186,7 +183,6 @@ void parse_rcfile2(const char *filename, rckeys2 *keys) {
                }
                fclose(fp);
        }
-       free(family);
 }
 
 
-- 
2.1.4


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.