commit 8add7e25559d0f1d3914e5220a52993c7abd7674
author Andres Morales <anmorales@google.com> Tue Mar 24 11:10:42 2015 -0700
committer Andres Morales <anmorales@google.com> Tue Mar 24 15:30:41 2015 -0700
tree ea9e99625aefefba5878fee69956683836e051c3
parent becbbb102e3e47c6a40a45b208b5bd3907032381

Make Serialize take an allocated buffer.

Makes memory management more explicit on the client
side.

Change-Id: I517aa8fb916fccec7c61c5dbee51f163a0a947ea

tests/gatekeeper_messages_test.cpp

diff --git a/tests/gatekeeper_messages_test.cpp b/tests/gatekeeper_messages_test.cpp
index e58db04..1380aac 100644
--- a/tests/gatekeeper_messages_test.cpp
+++ b/tests/gatekeeper_messages_test.cpp
@@ -52,10 +52,12 @@
     const SizedBuffer *deserialized_password;
     // create request, serialize, deserialize, and validate
     EnrollRequest req(USER_ID, NULL, provided_password, NULL);
-    uint8_t *serialized_req = req.Serialize();
+    SizedBuffer serialized_req(req.GetSerializedSize());
+    req.Serialize(serialized_req.buffer.get(), serialized_req.buffer.get() + serialized_req.length);
+
     EnrollRequest deserialized_req;
-    deserialized_req.Deserialize(serialized_req, serialized_req + req.GetSerializedSize());
-    delete[] serialized_req;
+    deserialized_req.Deserialize(serialized_req.buffer.get(), serialized_req.buffer.get()
+            + serialized_req.length);
 
     ASSERT_EQ(gatekeeper::gatekeeper_error_t::ERROR_NONE,
             deserialized_req.error);
@@ -79,10 +81,12 @@
     const SizedBuffer *deserialized_password;
     // create request, serialize, deserialize, and validate
     EnrollRequest req(USER_ID, &handle, provided_password, &enrolled);
-    uint8_t *serialized_req = req.Serialize();
+    SizedBuffer serialized_req(req.GetSerializedSize());
+    req.Serialize(serialized_req.buffer.get(), serialized_req.buffer.get() + serialized_req.length);
+
     EnrollRequest deserialized_req;
-    deserialized_req.Deserialize(serialized_req, serialized_req + req.GetSerializedSize());
-    delete[] serialized_req;
+    deserialized_req.Deserialize(serialized_req.buffer.get(), serialized_req.buffer.get()
+            + serialized_req.length);
 
     ASSERT_EQ(gatekeeper::gatekeeper_error_t::ERROR_NONE,
             deserialized_req.error);
@@ -108,10 +112,12 @@
     const SizedBuffer *deserialized_handle;
     // create request, serialize, deserialize, and validate
     EnrollRequest req(USER_ID, password_handle, provided_password, enrolled_password);
-    uint8_t *serialized_req = req.Serialize();
+    SizedBuffer serialized_req(req.GetSerializedSize());
+    req.Serialize(serialized_req.buffer.get(), serialized_req.buffer.get() + serialized_req.length);
+
     EnrollRequest deserialized_req;
-    deserialized_req.Deserialize(serialized_req, serialized_req + req.GetSerializedSize());
-    delete[] serialized_req;
+    deserialized_req.Deserialize(serialized_req.buffer.get(), serialized_req.buffer.get()
+            + serialized_req.length);
 
     ASSERT_EQ(gatekeeper::gatekeeper_error_t::ERROR_NONE,
             deserialized_req.error);
@@ -138,10 +144,12 @@
     const SizedBuffer *deserialized_password;
     // create request, serialize, deserialize, and validate
     EnrollResponse req(USER_ID, enrolled_password);
-    uint8_t *serialized_req = req.Serialize();
+    SizedBuffer serialized_req(req.GetSerializedSize());
+    req.Serialize(serialized_req.buffer.get(), serialized_req.buffer.get() + serialized_req.length);
+
     EnrollResponse deserialized_req;
-    deserialized_req.Deserialize(serialized_req, serialized_req + req.GetSerializedSize());
-    delete[] serialized_req;
+    deserialized_req.Deserialize(serialized_req.buffer.get(), serialized_req.buffer.get()
+            + serialized_req.length);
 
     ASSERT_EQ(gatekeeper::gatekeeper_error_t::ERROR_NONE,
             deserialized_req.error);
@@ -160,9 +168,12 @@
     const SizedBuffer *deserialized_password;
     // create request, serialize, deserialize, and validate
     VerifyRequest req(USER_ID, password_handle, provided_password);
-    uint8_t *serialized_req = req.Serialize();
+    SizedBuffer serialized_req(req.GetSerializedSize());
+    req.Serialize(serialized_req.buffer.get(), serialized_req.buffer.get() + serialized_req.length);
+
     VerifyRequest deserialized_req;
-    deserialized_req.Deserialize(serialized_req, serialized_req + req.GetSerializedSize());
+    deserialized_req.Deserialize(serialized_req.buffer.get(), serialized_req.buffer.get()
+            + serialized_req.length);
 
     ASSERT_EQ(gatekeeper::gatekeeper_error_t::ERROR_NONE,
             deserialized_req.error);
@@ -185,10 +196,12 @@
     const SizedBuffer *deserialized_password;
     // create request, serialize, deserialize, and validate
     VerifyResponse req(USER_ID, auth_token);
-    uint8_t *serialized_req = req.Serialize();
+    SizedBuffer serialized_req(req.GetSerializedSize());
+    req.Serialize(serialized_req.buffer.get(), serialized_req.buffer.get() + serialized_req.length);
+
     VerifyResponse deserialized_req;
-    deserialized_req.Deserialize(serialized_req, serialized_req + req.GetSerializedSize());
-    delete[] serialized_req;
+    deserialized_req.Deserialize(serialized_req.buffer.get(), serialized_req.buffer.get()
+            + serialized_req.length);
 
     ASSERT_EQ(gatekeeper::gatekeeper_error_t::ERROR_NONE,
             deserialized_req.error);