diff options
| author | Eli Zaretskii | 2008-12-05 07:09:16 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2008-12-05 07:09:16 +0000 |
| commit | 2fdc7d00310ccd6fc443ff14e60f6cca434fc657 (patch) | |
| tree | 9bd9b713ab7f3e254e8142d30345ad7b553fa451 /src/process.c | |
| parent | 248c026bbb979ac70bfd23e2551d129aed91582e (diff) | |
| download | emacs-2fdc7d00310ccd6fc443ff14e60f6cca434fc657.tar.gz emacs-2fdc7d00310ccd6fc443ff14e60f6cca434fc657.zip | |
(procfs_system_process_attributes): Don't use cmd, cmdsize, and q without
initializing them first.
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/process.c b/src/process.c index b8e390ed39f..b5d2f3d4c9f 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -7246,9 +7246,9 @@ procfs_system_process_attributes (pid) | |||
| 7246 | char procbuf[1025], *p, *q; | 7246 | char procbuf[1025], *p, *q; |
| 7247 | int fd; | 7247 | int fd; |
| 7248 | ssize_t nread; | 7248 | ssize_t nread; |
| 7249 | const char *cmd; | 7249 | const char *cmd = NULL; |
| 7250 | char *cmdline = NULL; | 7250 | char *cmdline = NULL; |
| 7251 | size_t cmdsize, cmdline_size; | 7251 | size_t cmdsize = 0, cmdline_size; |
| 7252 | unsigned char c; | 7252 | unsigned char c; |
| 7253 | int proc_id, ppid, uid, gid, pgrp, sess, tty, tpgid, thcount; | 7253 | int proc_id, ppid, uid, gid, pgrp, sess, tty, tpgid, thcount; |
| 7254 | unsigned long long utime, stime, cutime, cstime, start; | 7254 | unsigned long long utime, stime, cutime, cstime, start; |
| @@ -7300,7 +7300,6 @@ procfs_system_process_attributes (pid) | |||
| 7300 | procbuf[nread] = '\0'; | 7300 | procbuf[nread] = '\0'; |
| 7301 | p = procbuf; | 7301 | p = procbuf; |
| 7302 | 7302 | ||
| 7303 | cmd = NULL; | ||
| 7304 | p = strchr (p, '('); | 7303 | p = strchr (p, '('); |
| 7305 | if (p != NULL) | 7304 | if (p != NULL) |
| 7306 | { | 7305 | { |
| @@ -7312,6 +7311,8 @@ procfs_system_process_attributes (pid) | |||
| 7312 | cmdsize = q - cmd; | 7311 | cmdsize = q - cmd; |
| 7313 | } | 7312 | } |
| 7314 | } | 7313 | } |
| 7314 | else | ||
| 7315 | q = NULL; | ||
| 7315 | if (cmd == NULL) | 7316 | if (cmd == NULL) |
| 7316 | { | 7317 | { |
| 7317 | cmd = "???"; | 7318 | cmd = "???"; |
| @@ -7452,6 +7453,10 @@ procfs_system_process_attributes (pid) | |||
| 7452 | } | 7453 | } |
| 7453 | else | 7454 | else |
| 7454 | { | 7455 | { |
| 7456 | if (!cmd) | ||
| 7457 | cmd = "???"; | ||
| 7458 | if (!cmdsize) | ||
| 7459 | cmdsize = strlen (cmd); | ||
| 7455 | cmdline_size = cmdsize + 2; | 7460 | cmdline_size = cmdsize + 2; |
| 7456 | cmdline = xmalloc (cmdline_size + 1); | 7461 | cmdline = xmalloc (cmdline_size + 1); |
| 7457 | strcpy (cmdline, "["); | 7462 | strcpy (cmdline, "["); |