diff options
| author | Lennart Poettering <lennart@poettering.net> | 2020-07-14 16:59:22 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2020-07-14 17:06:23 +0200 |
| commit | a07f18cd30ecbfb21c9f39c13563fb9e65450789 (patch) | |
| tree | 59d9000d3de35a3ac053941de6f14d6c952d8579 /src/basic/process-util.h | |
| parent | 56870d324bb3210ba8712167f145a535d5d319d6 (diff) | |
| download | systemd-a07f18cd30ecbfb21c9f39c13563fb9e65450789.tar.gz | |
process-util: make sure procfs_file_alloca() works for non-literal field names too
Diffstat (limited to 'src/basic/process-util.h')
| -rw-r--r-- | src/basic/process-util.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/basic/process-util.h b/src/basic/process-util.h index e0b52246ba..49bb74ac0f 100644 --- a/src/basic/process-util.h +++ b/src/basic/process-util.h @@ -20,14 +20,16 @@ #define procfs_file_alloca(pid, field) \ ({ \ pid_t _pid_ = (pid); \ - const char *_r_; \ + const char *_field_ = (field); \ + char *_r_; \ if (_pid_ == 0) { \ - _r_ = ("/proc/self/" field); \ + _r_ = newa(char, STRLEN("/proc/self/") + strlen(_field_) + 1); \ + strcpy(stpcpy(_r_, "/proc/self/"), _field_); \ } else { \ - _r_ = newa(char, STRLEN("/proc/") + DECIMAL_STR_MAX(pid_t) + 1 + sizeof(field)); \ - sprintf((char*) _r_, "/proc/"PID_FMT"/" field, _pid_); \ + _r_ = newa(char, STRLEN("/proc/") + DECIMAL_STR_MAX(pid_t) + 1 + strlen(_field_) + 1); \ + sprintf(_r_, "/proc/" PID_FMT "/%s", _pid_, _field_); \ } \ - _r_; \ + (const char*) _r_; \ }) typedef enum ProcessCmdlineFlags { |