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

Commit 0dbb65af authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6449986 from 090eb403 to rvc-release 

Change-Id: I402cebb2504e973cacc1d5c238864ae71e093bdc
parents 2d4c3fc4 090eb403

base/file.cpp

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ bool ReadFdToString(borrowed_fd fd, std::string* content) { 
    content->reserve(sb.st_size);

  }



  char buf[BUFSIZ];

  char buf[BUFSIZ] __attribute__((__uninitialized__));

  ssize_t n;

  while ((n = TEMP_FAILURE_RETRY(read(fd.get(), &buf[0], sizeof(buf)))) > 0) {

    content->append(buf, n);

base/logging.cpp

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ static void KernelLogLine(const char* msg, int length, android::base::LogSeverit 
  // The kernel's printk buffer is only 1024 bytes.

  // TODO: should we automatically break up long lines into multiple lines?

  // Or we could log but with something like "..." at the end?

  char buf[1024];

  char buf[1024] __attribute__((__uninitialized__));

  size_t size = snprintf(buf, sizeof(buf), "<%d>%s: %.*s\n", level, tag, length, msg);

  if (size > sizeof(buf)) {

    size = snprintf(buf, sizeof(buf), "<%d>%s: %zu-byte message too long for printk\n",

base/stringprintf.cpp

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ namespace base { 


void StringAppendV(std::string* dst, const char* format, va_list ap) {

  // First try with a small fixed size buffer

  char space[1024];

  char space[1024] __attribute__((__uninitialized__));



  // It's possible for methods that use a va_list to invalidate

  // the data in it upon use.  The fix is to make a copy

logd/tests/logd_test.cpp

+2 −0
Original line number Diff line number Diff line
@@ -582,6 +582,7 @@ TEST(logd, timeout_start_epoch) { 
        "dumpAndClose lids=0,1,2,3,4,5 timeout=6 start=0.000000000");

}



#ifdef ENABLE_FLAKY_TESTS

// b/26447386 refined behavior

TEST(logd, timeout) {

#ifdef __ANDROID__
@@ -716,6 +717,7 @@ TEST(logd, timeout) { 
    GTEST_LOG_(INFO) << "This test does nothing.\n";

#endif

}

#endif



// b/27242723 confirmed fixed

TEST(logd, SNDTIMEO) {