diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-03-08 17:14:43 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2010-03-08 17:14:43 -0800 |
| commit | 7df6349a63b89d279131ec7dd7e6ef1b065854f5 (patch) | |
| tree | 030b554cb95806d7da5eb72d17436de70f686b63 /liblog/logprint.c | |
| parent | b51cb880c02836a57426620f40a1ba9331b6c52a (diff) | |
| parent | fd7ebb367330ea3b999ca9c2a48431c437c05f67 (diff) | |
| download | system_core-7df6349a63b89d279131ec7dd7e6ef1b065854f5.tar.gz system_core-7df6349a63b89d279131ec7dd7e6ef1b065854f5.tar.bz2 system_core-7df6349a63b89d279131ec7dd7e6ef1b065854f5.zip | |
merge from open-source master
Change-Id: I698b3c16bdef8751cc857b00f815cb2f95465431
Diffstat (limited to 'liblog/logprint.c')
| -rw-r--r-- | liblog/logprint.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/liblog/logprint.c b/liblog/logprint.c index 5ddda3626..4c5b3e578 100644 --- a/liblog/logprint.c +++ b/liblog/logprint.c @@ -753,6 +753,16 @@ char *android_log_formatLogLine ( suffixLen = 1; break; } + /* snprintf has a weird return value. It returns what would have been + * written given a large enough buffer. In the case that the prefix is + * longer then our buffer(128), it messes up the calculations below + * possibly causing heap corruption. To avoid this we double check and + * set the length at the maximum (size minus null byte) + */ + if(prefixLen >= sizeof(prefixBuf)) + prefixLen = sizeof(prefixBuf) - 1; + if(suffixLen >= sizeof(suffixBuf)) + suffixLen = sizeof(suffixBuf) - 1; /* the following code is tragically unreadable */ |