diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-05-17 09:55:13 +0200 |
|---|---|---|
| committer | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-05-18 20:56:33 +0000 |
| commit | 90891602fc826d11985910fc8e892706cd419539 (patch) | |
| tree | 4900746825559f2eccabd56820fbe8cb26750bb4 | |
| parent | 77eaa0e4f3727a06a03a0c92b83e9fe2f6a2efb1 (diff) | |
limit scanf string field width
Change-Id: I9070bae914d923171b6eaf8209de00922dc87be7
Reviewed-on: https://gerrit.libreoffice.org/25052
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
| -rw-r--r-- | dtrans/source/cnttype/wbench/testcnttype.cxx | 2 | ||||
| -rw-r--r-- | sal/osl/unx/process.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/dtrans/source/cnttype/wbench/testcnttype.cxx b/dtrans/source/cnttype/wbench/testcnttype.cxx index f6482c2d6e03..b4cfb7a5c0d3 100644 --- a/dtrans/source/cnttype/wbench/testcnttype.cxx +++ b/dtrans/source/cnttype/wbench/testcnttype.cxx @@ -71,7 +71,7 @@ sal_Bool readCntTypesFromFileIntoVector( char* fname, vector< string >& vecData fseek( fstream, 0L, SEEK_SET ); char line[1024]; - while ( fscanf( fstream, "%[^\n]s", line ) != EOF ) + while ( fscanf( fstream, "%1023[^\n]s", line ) != EOF ) { vecData.push_back( line ); fgetc( fstream ); diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx index 391b1604a79a..4d372a3eb3d0 100644 --- a/sal/osl/unx/process.cxx +++ b/sal/osl/unx/process.cxx @@ -899,7 +899,7 @@ bool osl_getProcStat(pid_t pid, struct osl_procStat* procstat) "%lu %li %li %li" "%lu %lu %li %lu" "%lu %lu %lu %lu %lu" - "%s %s %s %s" + "%23s %23s %23s %23s" "%lu %lu %lu", &procstat->state, &procstat->ppid, &procstat->pgrp, &procstat->session, &procstat->tty, &procstat->tpgid, @@ -975,7 +975,7 @@ bool osl_getProcStatus(pid_t pid, struct osl_procStat* procstat) tmp = strstr(prstatusbuf,"SigPnd:"); if(tmp) { - sscanf(tmp, "SigPnd: %s SigBlk: %s SigIgn: %s %*s %s", + sscanf(tmp, "SigPnd: %23s SigBlk: %23s SigIgn: %23s %*s %23s", procstat->signal, procstat->blocked, procstat->sigignore, procstat->sigcatch ); } |