snow/dockapps
1
0
Fork 0
Code Issues Releases Activity

wmgeneral: Fix segfault if newline encountered in parse_rcfile.

Browse source 
From a patch for wmppp.app by Chris Gray <cgray@tribsoft.com> submitted to
Debian to fix several bugs [1].

[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=27997
This commit is contained in:
Doug Torrance 2015-05-19 22:30:54 -05:00 committed by Carlos R. Mafra
parent cd30d4127d
commit a9b73f2fd6
12 changed files with 72 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
wmSMPmon/wmgeneral/wmgeneral.c
View file

@ -28,6 +28,9 @@
10/10/2003 (Simon Law, sfllaw@debian.org)
* changed the parse_rcfile function to use getline instead of
fgets.
10/14/2000 (Chris Gray, cgray@tribsoft.com)
* Removed a bug from parse_rcfile. An extra
newline would cause a segfault.
14/09/1998 (Dave Clark, clarkd@skyia.com)
* Updated createXBMfromXPM routine
* Now supports >256 colors
@ -128,6 +131,8 @@ void parse_rcfile(const char *filename, rckeys *keys) {
key = 0;
q = strdup(temp);
q = strtok(q, tokens);
if(!q)
continue;
while (key >= 0 && keys[key].label) {
if ((!strcmp(q, keys[key].label))) {
int i;
@ -135,7 +140,7 @@ void parse_rcfile(const char *filename, rckeys *keys) {
p = strstr(temp, keys[key].label);
p += strlen(keys[key].label);
p += strspn(p, tokens);
if ((i = strcspn(p, "#\n"))) p[i] = 0;
if ((i = strcspn(p, "#\n"))) p[i] = '\0';
free(*keys[key].var);
*keys[key].var = strdup(p);
key = -1;

7
wmckgmail/wmgeneral/wmgeneral.c
View file

@ -28,6 +28,9 @@
10/10/2003 (Simon Law, sfllaw@debian.org)
* changed the parse_rcfile function to use getline instead of
fgets.
10/14/2000 (Chris Gray, cgray@tribsoft.com)
* Removed a bug from parse_rcfile. An extra
newline would cause a segfault.
14/09/1998 (Dave Clark, clarkd@skyia.com)
* Updated createXBMfromXPM routine
* Now supports >256 colors
@ -128,6 +131,8 @@ void parse_rcfile(const char *filename, rckeys *keys) {
key = 0;
q = strdup(temp);
q = strtok(q, tokens);
if(!q)
continue;
while (key >= 0 && keys[key].label) {
if ((!strcmp(q, keys[key].label))) {
int i;
@ -135,7 +140,7 @@ void parse_rcfile(const char *filename, rckeys *keys) {
p = strstr(temp, keys[key].label);
p += strlen(keys[key].label);
p += strspn(p, tokens);
if ((i = strcspn(p, "#\n"))) p[i] = 0;
if ((i = strcspn(p, "#\n"))) p[i] = '\0';
free(*keys[key].var);
*keys[key].var = strdup(p);
key = -1;

7
wmcpufreq/wmgeneral/wmgeneral.c
View file

@ -28,6 +28,9 @@
10/10/2003 (Simon Law, sfllaw@debian.org)
* changed the parse_rcfile function to use getline instead of
fgets.
10/14/2000 (Chris Gray, cgray@tribsoft.com)
* Removed a bug from parse_rcfile. An extra
newline would cause a segfault.
14/09/1998 (Dave Clark, clarkd@skyia.com)
* Updated createXBMfromXPM routine
* Now supports >256 colors
@ -128,6 +131,8 @@ void parse_rcfile(const char *filename, rckeys *keys) {
key = 0;
q = strdup(temp);
q = strtok(q, tokens);
if(!q)
continue;
while (key >= 0 && keys[key].label) {
if ((!strcmp(q, keys[key].label))) {
int i;
@ -135,7 +140,7 @@ void parse_rcfile(const char *filename, rckeys *keys) {
p = strstr(temp, keys[key].label);
p += strlen(keys[key].label);
p += strspn(p, tokens);
if ((i = strcspn(p, "#\n"))) p[i] = 0;
if ((i = strcspn(p, "#\n"))) p[i] = '\0';
free(*keys[key].var);
*keys[key].var = strdup(p);
key = -1;

7
wmfsm/wmgeneral/wmgeneral.c
View file

@ -28,6 +28,9 @@
10/10/2003 (Simon Law, sfllaw@debian.org)
* changed the parse_rcfile function to use getline instead of
fgets.
10/14/2000 (Chris Gray, cgray@tribsoft.com)
* Removed a bug from parse_rcfile. An extra
newline would cause a segfault.
14/09/1998 (Dave Clark, clarkd@skyia.com)
* Updated createXBMfromXPM routine
* Now supports >256 colors
@ -128,6 +131,8 @@ void parse_rcfile(const char *filename, rckeys *keys) {
key = 0;
q = strdup(temp);
q = strtok(q, tokens);
if(!q)
continue;
while (key >= 0 && keys[key].label) {
if ((!strcmp(q, keys[key].label))) {
int i;
@ -135,7 +140,7 @@ void parse_rcfile(const char *filename, rckeys *keys) {
p = strstr(temp, keys[key].label);
p += strlen(keys[key].label);
p += strspn(p, tokens);
if ((i = strcspn(p, "#\n"))) p[i] = 0;
if ((i = strcspn(p, "#\n"))) p[i] = '\0';
free(*keys[key].var);
*keys[key].var = strdup(p);
key = -1;

7
wmifs/wmgeneral/wmgeneral.c
View file

@ -28,6 +28,9 @@
10/10/2003 (Simon Law, sfllaw@debian.org)
* changed the parse_rcfile function to use getline instead of
fgets.
10/14/2000 (Chris Gray, cgray@tribsoft.com)
* Removed a bug from parse_rcfile. An extra
newline would cause a segfault.
14/09/1998 (Dave Clark, clarkd@skyia.com)
* Updated createXBMfromXPM routine
* Now supports >256 colors
@ -128,6 +131,8 @@ void parse_rcfile(const char *filename, rckeys *keys) {
key = 0;
q = strdup(temp);
q = strtok(q, tokens);
if(!q)
continue;
while (key >= 0 && keys[key].label) {
if ((!strcmp(q, keys[key].label))) {
int i;
@ -135,7 +140,7 @@ void parse_rcfile(const char *filename, rckeys *keys) {
p = strstr(temp, keys[key].label);
p += strlen(keys[key].label);
p += strspn(p, tokens);
if ((i = strcspn(p, "#\n"))) p[i] = 0;
if ((i = strcspn(p, "#\n"))) p[i] = '\0';
free(*keys[key].var);
*keys[key].var = strdup(p);
key = -1;

7
wmitime/wmgeneral/wmgeneral.c
View file

@ -28,6 +28,9 @@
10/10/2003 (Simon Law, sfllaw@debian.org)
* changed the parse_rcfile function to use getline instead of
fgets.
10/14/2000 (Chris Gray, cgray@tribsoft.com)
* Removed a bug from parse_rcfile. An extra
newline would cause a segfault.
14/09/1998 (Dave Clark, clarkd@skyia.com)
* Updated createXBMfromXPM routine
* Now supports >256 colors
@ -128,6 +131,8 @@ void parse_rcfile(const char *filename, rckeys *keys) {
key = 0;
q = strdup(temp);
q = strtok(q, tokens);
if(!q)
continue;
while (key >= 0 && keys[key].label) {
if ((!strcmp(q, keys[key].label))) {
int i;
@ -135,7 +140,7 @@ void parse_rcfile(const char *filename, rckeys *keys) {
p = strstr(temp, keys[key].label);
p += strlen(keys[key].label);
p += strspn(p, tokens);
if ((i = strcspn(p, "#\n"))) p[i] = 0;
if ((i = strcspn(p, "#\n"))) p[i] = '\0';
free(*keys[key].var);
*keys[key].var = strdup(p);
key = -1;

7
wmkeys/wmgeneral/wmgeneral.c
View file

@ -28,6 +28,9 @@
10/10/2003 (Simon Law, sfllaw@debian.org)
* changed the parse_rcfile function to use getline instead of
fgets.
10/14/2000 (Chris Gray, cgray@tribsoft.com)
* Removed a bug from parse_rcfile. An extra
newline would cause a segfault.
14/09/1998 (Dave Clark, clarkd@skyia.com)
* Updated createXBMfromXPM routine
* Now supports >256 colors
@ -128,6 +131,8 @@ void parse_rcfile(const char *filename, rckeys *keys) {
key = 0;
q = strdup(temp);
q = strtok(q, tokens);
if(!q)
continue;
while (key >= 0 && keys[key].label) {
if ((!strcmp(q, keys[key].label))) {
int i;
@ -135,7 +140,7 @@ void parse_rcfile(const char *filename, rckeys *keys) {
p = strstr(temp, keys[key].label);
p += strlen(keys[key].label);
p += strspn(p, tokens);
if ((i = strcspn(p, "#\n"))) p[i] = 0;
if ((i = strcspn(p, "#\n"))) p[i] = '\0';
free(*keys[key].var);
*keys[key].var = strdup(p);
key = -1;

7
wmmon/wmgeneral/wmgeneral.c
View file

@ -28,6 +28,9 @@
10/10/2003 (Simon Law, sfllaw@debian.org)
* changed the parse_rcfile function to use getline instead of
fgets.
10/14/2000 (Chris Gray, cgray@tribsoft.com)
* Removed a bug from parse_rcfile. An extra
newline would cause a segfault.
14/09/1998 (Dave Clark, clarkd@skyia.com)
* Updated createXBMfromXPM routine
* Now supports >256 colors
@ -128,6 +131,8 @@ void parse_rcfile(const char *filename, rckeys *keys) {
key = 0;
q = strdup(temp);
q = strtok(q, tokens);
if(!q)
continue;
while (key >= 0 && keys[key].label) {
if ((!strcmp(q, keys[key].label))) {
int i;
@ -135,7 +140,7 @@ void parse_rcfile(const char *filename, rckeys *keys) {
p = strstr(temp, keys[key].label);
p += strlen(keys[key].label);
p += strspn(p, tokens);
if ((i = strcspn(p, "#\n"))) p[i] = 0;
if ((i = strcspn(p, "#\n"))) p[i] = '\0';
free(*keys[key].var);
*keys[key].var = strdup(p);
key = -1;

7
wmppp.app/wmgeneral/wmgeneral.c
View file

@ -28,6 +28,9 @@
10/10/2003 (Simon Law, sfllaw@debian.org)
* changed the parse_rcfile function to use getline instead of
fgets.
10/14/2000 (Chris Gray, cgray@tribsoft.com)
* Removed a bug from parse_rcfile. An extra
newline would cause a segfault.
14/09/1998 (Dave Clark, clarkd@skyia.com)
* Updated createXBMfromXPM routine
* Now supports >256 colors
@ -128,6 +131,8 @@ void parse_rcfile(const char *filename, rckeys *keys) {
key = 0;
q = strdup(temp);
q = strtok(q, tokens);
if(!q)
continue;
while (key >= 0 && keys[key].label) {
if ((!strcmp(q, keys[key].label))) {
int i;
@ -135,7 +140,7 @@ void parse_rcfile(const char *filename, rckeys *keys) {
p = strstr(temp, keys[key].label);
p += strlen(keys[key].label);
p += strspn(p, tokens);
if ((i = strcspn(p, "#\n"))) p[i] = 0;
if ((i = strcspn(p, "#\n"))) p[i] = '\0';
free(*keys[key].var);
*keys[key].var = strdup(p);
key = -1;

7
wmsm.app/wmgeneral/wmgeneral.c
View file

@ -28,6 +28,9 @@
10/10/2003 (Simon Law, sfllaw@debian.org)
* changed the parse_rcfile function to use getline instead of
fgets.
10/14/2000 (Chris Gray, cgray@tribsoft.com)
* Removed a bug from parse_rcfile. An extra
newline would cause a segfault.
14/09/1998 (Dave Clark, clarkd@skyia.com)
* Updated createXBMfromXPM routine
* Now supports >256 colors
@ -128,6 +131,8 @@ void parse_rcfile(const char *filename, rckeys *keys) {
key = 0;
q = strdup(temp);
q = strtok(q, tokens);
if(!q)
continue;
while (key >= 0 && keys[key].label) {
if ((!strcmp(q, keys[key].label))) {
int i;
@ -135,7 +140,7 @@ void parse_rcfile(const char *filename, rckeys *keys) {
p = strstr(temp, keys[key].label);
p += strlen(keys[key].label);
p += strspn(p, tokens);
if ((i = strcspn(p, "#\n"))) p[i] = 0;
if ((i = strcspn(p, "#\n"))) p[i] = '\0';
free(*keys[key].var);
*keys[key].var = strdup(p);
key = -1;

7
wmtime/wmgeneral/wmgeneral.c
View file

@ -28,6 +28,9 @@
10/10/2003 (Simon Law, sfllaw@debian.org)
* changed the parse_rcfile function to use getline instead of
fgets.
10/14/2000 (Chris Gray, cgray@tribsoft.com)
* Removed a bug from parse_rcfile. An extra
newline would cause a segfault.
14/09/1998 (Dave Clark, clarkd@skyia.com)
* Updated createXBMfromXPM routine
* Now supports >256 colors
@ -128,6 +131,8 @@ void parse_rcfile(const char *filename, rckeys *keys) {
key = 0;
q = strdup(temp);
q = strtok(q, tokens);
if(!q)
continue;
while (key >= 0 && keys[key].label) {
if ((!strcmp(q, keys[key].label))) {
int i;
@ -135,7 +140,7 @@ void parse_rcfile(const char *filename, rckeys *keys) {
p = strstr(temp, keys[key].label);
p += strlen(keys[key].label);
p += strspn(p, tokens);
if ((i = strcspn(p, "#\n"))) p[i] = 0;
if ((i = strcspn(p, "#\n"))) p[i] = '\0';
free(*keys[key].var);
*keys[key].var = strdup(p);
key = -1;

7
wmtz/wmgeneral/wmgeneral.c
View file

@ -28,6 +28,9 @@
10/10/2003 (Simon Law, sfllaw@debian.org)
* changed the parse_rcfile function to use getline instead of
fgets.
10/14/2000 (Chris Gray, cgray@tribsoft.com)
* Removed a bug from parse_rcfile. An extra
newline would cause a segfault.
14/09/1998 (Dave Clark, clarkd@skyia.com)
* Updated createXBMfromXPM routine
* Now supports >256 colors
@ -128,6 +131,8 @@ void parse_rcfile(const char *filename, rckeys *keys) {
key = 0;
q = strdup(temp);
q = strtok(q, tokens);
if(!q)
continue;
while (key >= 0 && keys[key].label) {
if ((!strcmp(q, keys[key].label))) {
int i;
@ -135,7 +140,7 @@ void parse_rcfile(const char *filename, rckeys *keys) {
p = strstr(temp, keys[key].label);
p += strlen(keys[key].label);
p += strspn(p, tokens);
if ((i = strcspn(p, "#\n"))) p[i] = 0;
if ((i = strcspn(p, "#\n"))) p[i] = '\0';
free(*keys[key].var);
*keys[key].var = strdup(p);
key = -1;