From 073a7f6695bd16937eb0345459de2ad10c4e0cd2 Mon Sep 17 00:00:00 2001
From: jimblandy <jimblandy@4c0a9323-5329-0410-9bdc-e9ce6186880e>
Date: Wed, 5 May 2010 17:37:58 +0000
Subject: [PATCH] Breakpad unit tests: Add support for clipped-size
 null-terminated strings to TestAssembler::Section.

This patch helps the TestAssembler classes generate Mach-O object files for
use as test input.

This patch adds a new AppendCString overloading to TestAssembler::Section
for emitting null-terminated strings in fixed-length buffers, where the
string is truncated and the terminating null character omitted if the
string is too large for the buffer.

The patch includes unit tests for the new AppendCString overloading. It
also provides some for the existing overloading, which had been neglected.

a=jimblandy, r=mark


git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@590 4c0a9323-5329-0410-9bdc-e9ce6186880e
---
 src/common/test_assembler.h           |  9 +++++++++
 src/common/test_assembler_unittest.cc | 18 ++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/src/common/test_assembler.h b/src/common/test_assembler.h
index 560f7aef..19782b92 100644
--- a/src/common/test_assembler.h
+++ b/src/common/test_assembler.h
@@ -324,6 +324,15 @@ class Section {
     return *this;
   }
 
+  // Append at most SIZE bytes from DATA; if DATA is less than SIZE bytes
+  // long, pad with '\0' characters.
+  Section &AppendCString(const string &data, size_t size) {
+    contents_.append(data, 0, size);
+    if (data.size() < size)
+      Append(size - data.size(), 0);
+    return *this;
+  }
+
   // Append VALUE or LABEL to this section, with the given bit width and
   // endianness. Return a reference to this section.
   //
diff --git a/src/common/test_assembler_unittest.cc b/src/common/test_assembler_unittest.cc
index 9b6990ce..c26a9383 100644
--- a/src/common/test_assembler_unittest.cc
+++ b/src/common/test_assembler_unittest.cc
@@ -788,6 +788,24 @@ TEST_F(Append, String) {
   ASSERT_STREQ(contents.c_str(), "howdy there");
 }
 
+TEST_F(Append, CString) {
+  section.AppendCString("howdy");
+  section.AppendCString("");
+  section.AppendCString("there");
+  ASSERT_TRUE(section.GetContents(&contents));
+  ASSERT_EQ(string("howdy\0\0there\0", 13), contents);
+}
+
+TEST_F(Append, CStringSize) {
+  section.AppendCString("howdy", 3);
+  section.AppendCString("there", 5);
+  section.AppendCString("fred", 6);
+  section.AppendCString("natalie", 0);
+  section.AppendCString("", 10);
+  ASSERT_TRUE(section.GetContents(&contents));
+  ASSERT_EQ(string("howtherefred\0\0\0\0\0\0\0\0\0\0\0\0", 24), contents);
+}
+
 TEST_F(Append, RepeatedBytes) {
   section.Append((size_t) 10, '*');
   ASSERT_TRUE(section.GetContents(&contents));