github/santa
1
1
Fork 0
mirror of https://github.com/google/santa.git synced 2026-04-24 03:00:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

santad: argsForPid: Don't replace last NULL but still count up to it

Browse Source
This commit is contained in:
Russell Hancox
2016-06-30 16:36:32 -04:00
parent f20825a66c
commit 629bd4aff9
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/santad/SNTEventLog.m
View File

@@ -265,7 +265,7 @@
// Loop through the string one character at a time, looking for the characters
// we want to remove.
for (const char *p = str; (c = *p) != 0; p++) {
for (const char *p = str; (c = *p) != 0; ++p) {
if (c == '|' || c == '\n' || c == '\r') {
if (!buf) {
// If string size * 6 is more than 64KiB use malloc, otherwise use stack space.
@@ -375,10 +375,11 @@
// Replace all NULLs with spaces up until the first environment variable
int replacedNulls = 0;
for (; index < argsSize && replacedNulls < argc - 1; ++index) {
for (; index < argsSize; ++index) {
if (bytes[index] == '\0') {
bytes[index] = ' ';
++replacedNulls;
if (replacedNulls == argc) break;
bytes[index] = ' ';
}
}