commit 4303df31f9239a128b180fee0607ea5000f23266
author baustin <baustin@google.com> Tue Jan 27 00:37:54 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 27 00:37:55 2015 +0000
tree a291bf4b0c140a5a956559abd7a3af21ab3f8cc5
parent af8f176d4d3ae5faa67c42012d52171f1a0cd80f
parent 290ac82642b683a276c07a92bf2e1c73f931ab67

Merge "Endian swap the message size parameter."

cc/gfxspy/src/Loader.cpp

diff --git a/cc/gfxspy/src/Loader.cpp b/cc/gfxspy/src/Loader.cpp
index ad9be43..8624a09 100644
--- a/cc/gfxspy/src/Loader.cpp
+++ b/cc/gfxspy/src/Loader.cpp
@@ -167,7 +167,7 @@
             // (e.g.  "foolibEGL.so"), but we do want to intercept calls that begin
             // with a path (e.g. "/system/lib/libEGL.so").
             if (matchedString == filename || (*(matchedString - 1)) == '/') {
-                ALOGI("Changing dlopen(\"%s\", %d) to sRealDlopenPointer(\"libgfxspy.so\", %d).",
+                ALOGI("Changing dlopen(\"%s\", %d) to realDlopen(\"libgfxspy.so\", %d).",
                         filename, flag, flag);
                 filename = "libgfxspy.so";
             }

cc/gfxspy/src/gltrace_transport.cpp

diff --git a/cc/gfxspy/src/gltrace_transport.cpp b/cc/gfxspy/src/gltrace_transport.cpp
index aafc192..4d55b3f 100644
--- a/cc/gfxspy/src/gltrace_transport.cpp
+++ b/cc/gfxspy/src/gltrace_transport.cpp
@@ -171,7 +171,7 @@
 }
 
 void BufferedOutputStream::enqueueMessage(GLMessage *msg) {
-    const uint32_t len = msg->ByteSize();
+    const uint32_t len = htonl(msg->ByteSize());
 
     // Send the message size, then the message.
     mStringBuffer.append((const char *)&len, sizeof(len));