commit 9d25de701720b583dba39df0b10fd23e18eb33ed
author Elliott Hughes <enh@google.com> Wed Dec 06 17:56:03 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 06 17:56:03 2023 +0000
tree b9dad30126dd7091847acfcfb1d1f63856f753e3
parent 82d91c6b7c62921e45435ed9da7e54659bfcbc54
parent 522baf2487569d0bfffee7797a295add66e632bd

Escape newlines in `-v printable`. am: 522baf2487

Original change: https://android-review.googlesource.com/c/platform/system/logging/+/2860428

Change-Id: Ib86296ec4a8af63933971089ed6f52e97c0c9f92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

liblog/logprint.cpp

diff --git a/liblog/logprint.cpp b/liblog/logprint.cpp
index e182b75..aece1fa 100644
--- a/liblog/logprint.cpp
+++ b/liblog/logprint.cpp
@@ -1099,9 +1099,9 @@
   bool print = (dst != nullptr);
 
   while (n > 0) {
-    // ASCII fast path to cover most logging; space/tab/newline aren't escaped,
+    // ASCII fast path to cover most logging; space and tab aren't escaped,
     // but backslash is.
-    if ((*src >= ' ' && *src < 0x7f && *src != '\\') || *src == '\n' || *src == '\t') {
+    if ((*src >= ' ' && *src < 0x7f && *src != '\\') || *src == '\t') {
       if (print) *dst = *src;
       dst++;
       src++;

liblog/tests/logprint_test.cpp

diff --git a/liblog/tests/logprint_test.cpp b/liblog/tests/logprint_test.cpp
index 6329241..dac8c48 100644
--- a/liblog/tests/logprint_test.cpp
+++ b/liblog/tests/logprint_test.cpp
@@ -44,8 +44,8 @@
   // We want to test escaping of ASCII NUL at the end too.
   auto input_size = input.size() + 1;
 
-  // Note that \t and \n are not escaped.
-  std::string expected_output = "escape\\x00\\x7F\\a\\b\t\n\\v\\f\\r\\\\\\x00"s;
+  // Note that \t is not escaped.
+  std::string expected_output = "escape\\x00\\x7F\\a\\b\t\\n\\v\\f\\r\\\\\\x00"s;
   auto expected_output_size = expected_output.size();
 
   auto output_size = convertPrintable(nullptr, input.c_str(), input_size);