[libc-commits] [PATCH] D127914: [libc] fix line buffered empty file writes

[Michael Jones via Phabricator via libc-commits]

michaelrj created this revision.
michaelrj added reviewers: sivachandra, lntue.
Herald added subscribers: libc-commits, ecnelises, tschuett.
Herald added projects: libc-project, All.
michaelrj requested review of this revision.

Previously, any line buffered write of size 0 would cause an error.
The variable used to track the index of the last newline started at
the size of the write - 1, which underflowed. Now it's handled properly,
and a test has been added to prevent regressions.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D127914

Files:
  libc/src/__support/File/file.cpp
  libc/test/src/__support/File/file_test.cpp


Index: libc/test/src/__support/File/file_test.cpp
===================================================================
--- libc/test/src/__support/File/file_test.cpp
+++ libc/test/src/__support/File/file_test.cpp
@@ -458,3 +458,30 @@
   ASSERT_EQ(f_lbf->close(), 0);
   ASSERT_EQ(f_nbf->close(), 0);
 }
+
+TEST(LlvmLibcFileTest, WriteNothing) {
+  const char WRITE_DATA[] = "";
+  constexpr size_t WRITE_SIZE = 0;
+  constexpr size_t FILE_BUFFER_SIZE = 5;
+  char file_buffer_fbf[FILE_BUFFER_SIZE];
+  char file_buffer_lbf[FILE_BUFFER_SIZE];
+  char file_buffer_nbf[FILE_BUFFER_SIZE];
+  StringFile *f_fbf =
+      new_string_file(file_buffer_fbf, FILE_BUFFER_SIZE, _IOFBF, false, "w");
+  StringFile *f_lbf =
+      new_string_file(file_buffer_lbf, FILE_BUFFER_SIZE, _IOLBF, false, "w");
+  StringFile *f_nbf =
+      new_string_file(file_buffer_nbf, FILE_BUFFER_SIZE, _IONBF, false, "w");
+
+  ASSERT_EQ(WRITE_SIZE, f_fbf->write(WRITE_DATA, WRITE_SIZE));
+  ASSERT_EQ(WRITE_SIZE, f_lbf->write(WRITE_DATA, WRITE_SIZE));
+  ASSERT_EQ(WRITE_SIZE, f_nbf->write(WRITE_DATA, WRITE_SIZE));
+
+  ASSERT_FALSE(f_fbf->error_unlocked());
+  ASSERT_FALSE(f_lbf->error_unlocked());
+  ASSERT_FALSE(f_nbf->error_unlocked());
+
+  ASSERT_EQ(f_fbf->close(), 0);
+  ASSERT_EQ(f_lbf->close(), 0);
+  ASSERT_EQ(f_nbf->close(), 0);
+}
Index: libc/src/__support/File/file.cpp
===================================================================
--- libc/src/__support/File/file.cpp
+++ libc/src/__support/File/file.cpp
@@ -130,9 +130,9 @@
 size_t File::write_unlocked_lbf(const void *data, size_t len) {
   constexpr char NEWLINE_CHAR = '\n';
   size_t last_newline = len;
-  for (size_t i = len - 1; i > 0; --i) {
-    if (static_cast<const char *>(data)[i] == NEWLINE_CHAR) {
-      last_newline = i;
+  for (size_t i = len; i > 1; --i) {
+    if (static_cast<const char *>(data)[i - 1] == NEWLINE_CHAR) {
+      last_newline = i - 1;
       break;
     }
   }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D127914.437394.patch
Type: text/x-patch
Size: 1942 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libc-commits/attachments/20220615/2c1b8693/attachment-0001.bin>