fixed modify wild pointer

fixed Tencent#125

Author: garryyan

mars/comm/messagequeue/message_queue.cc

@@ -33,6 +33,7 @@
 #include "comm/anr.h"
 #include "comm/messagequeue/message_queue.h"
 #include "comm/time_utils.h"
+#include "comm/xlogger/xlogger.h"
 #ifdef __APPLE__
 #include "comm/debugger/debugger_utils.h"
 #endif
@@ -630,6 +631,8 @@ void RunLoop::Run() {
         ScopedLock lock(sg_messagequeue_map_mutex);
         sg_messagequeue_map[id].lst_runloop_info.push_back(RunLoopInfo());
     }
+    
+    xinfo_function(TSF"messagequeue id:%_", id);
 
     while (true) {
         ScopedLock lock(sg_messagequeue_map_mutex);
@@ -766,7 +769,7 @@ void MessageQueueCreater::__ThreadRunloop() {
     lock.unlock();
 
     RunLoop().Run();
-    messagequeue_id_ = 0;
+    
 }
 
 MessageQueue_t MessageQueueCreater::GetMessageQueue() {
@@ -780,7 +783,8 @@ MessageQueue_t MessageQueueCreater::CreateMessageQueue() {
 
     if (0 != thread_.start()) { return KInvalidQueueID;}
     messagequeue_id_ = __CreateMessageQueueInfo(breaker_, thread_.tid());
-
+    xinfo2(TSF"create messageqeue id:%_", messagequeue_id_);
+    
     return messagequeue_id_;
 }
 

mars/libraries/mars_android_sdk/jni/decode_mars_log_file.py.rewriteme

@@ -93,7 +93,7 @@ def DecodeBuffer(_buffer, _offset, _outbuffer):
             decompressor = zlib.decompressobj(-zlib.MAX_WBITS)
             decompress_data = bytearray()
             while len(tmpbuffer) > 0:
-                single_log_len = struct.unpack_from("H", tmpbuffer[0:2])[0]
+                single_log_len = struct.unpack_from("H", buffer(tmpbuffer, 0, 2))[0]
                 #decompress_data.extend(base64.decodestring(tmpbuffer[2:single_log_len+2]))
                 decompress_data.extend(tmpbuffer[2:single_log_len+2])
                 tmpbuffer[:] = tmpbuffer[single_log_len+2:len(tmpbuffer)]

mars/libraries/mars_android_sdk/jni/longlink_packer.h

@@ -12,7 +12,7 @@
 
 
 /*
- * longlink_packer.cpp
+ * longlink_packer.h
  *
  *  Created on: 2012-7-18
  *      Author: yerungui
@@ -34,7 +34,24 @@
 
 class AutoBuffer;
 
+/**
+ * package the request data
+ * _cmdid: business identifier
+ * _seq: task id
+ * _raw: business send buffer
+ * _packed: business send buffer + request header
+ */
 void longlink_pack(uint32_t _cmdid, uint32_t _seq, const void* _raw, size_t _raw_len, AutoBuffer& _packed);
+
+/**
+ * unpackage the response data
+ * _packed: data received from server
+ * _cmdid: business identifier
+ * _seq: task id
+ * _package_len:
+ * _body: business receive buffer
+ * return: 0 if unpackage succ
+ */
 int  longlink_unpack(const AutoBuffer& _packed, uint32_t& _cmdid, uint32_t& _seq, size_t& _package_len, AutoBuffer& _body);
 
 //heartbeat signal to keep longlink network alive
@@ -47,6 +64,10 @@ void longlink_noop_resp_body(AutoBuffer& _body);
 uint32_t longlink_noop_interval();
 
 bool longlink_complexconnect_need_verify();
+
+/**
+ * return: whether the received data is pushing from server or not
+ */
 bool is_push_data(uint32_t _cmdid, uint32_t _taskid);
 
 #endif // STN_SRC_LONGLINKPACKER_H_

mars/log/crypt/decode_mars_log_file.py

@@ -93,7 +93,7 @@ def DecodeBuffer(_buffer, _offset, _outbuffer):
             decompressor = zlib.decompressobj(-zlib.MAX_WBITS)
             decompress_data = bytearray()
             while len(tmpbuffer) > 0:
-                single_log_len = struct.unpack_from("H", tmpbuffer[0:2])[0]
+                single_log_len = struct.unpack_from("H", buffer(tmpbuffer, 0, 2))[0]
                 #decompress_data.extend(base64.decodestring(tmpbuffer[2:single_log_len+2]))
                 decompress_data.extend(tmpbuffer[2:single_log_len+2])
                 tmpbuffer[:] = tmpbuffer[single_log_len+2:len(tmpbuffer)]

samples/iOS/iOSDemoXlog/PublicComponentV2/decode_mars_log_file.py

@@ -93,7 +93,7 @@ def DecodeBuffer(_buffer, _offset, _outbuffer):
             decompressor = zlib.decompressobj(-zlib.MAX_WBITS)
             decompress_data = bytearray()
             while len(tmpbuffer) > 0:
-                single_log_len = struct.unpack_from("H", tmpbuffer[0:2])[0]
+                single_log_len = struct.unpack_from("H", buffer(tmpbuffer, 0, 2))[0]
                 #decompress_data.extend(base64.decodestring(tmpbuffer[2:single_log_len+2]))
                 decompress_data.extend(tmpbuffer[2:single_log_len+2])
                 tmpbuffer[:] = tmpbuffer[single_log_len+2:len(tmpbuffer)]