Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43912b16 authored by Nick Kralevich's avatar Nick Kralevich Committed by android-build-merger
Browse files

Merge "LogAudit.cpp: replace newlines with spaces in audit messages" am:... 

Merge "LogAudit.cpp: replace newlines with spaces in audit messages" am: 5badada9 am: 5083c589 am: 48ff04f9
am: 196969f9

Change-Id: I79e02a0348170723116fc8fc8f5fcd83dde3adbc
parents 0f5fd3f2 196969f9

logd/LogAudit.cpp

+7 −0
Original line number Diff line number Diff line
@@ -98,6 +98,13 @@ int LogAudit::logPrint(const char *fmt, ...) { 
    }



    char *cp;

    // Work around kernels missing

    // https://github.com/torvalds/linux/commit/b8f89caafeb55fba75b74bea25adc4e4cd91be67

    // Such kernels improperly add newlines inside audit messages.

    while ((cp = strchr(str, '\n'))) {

        *cp = ' ';

    }



    while ((cp = strstr(str, "  "))) {

        memmove(cp, cp + 1, strlen(cp + 1) + 1);

    }