Merge remote-tracking branch 'upstream/master'

mbus/mbus-protocol-aux.c

@@ -1437,8 +1437,14 @@ mbus_recv_frame(mbus_handle * handle, mbus_frame *frame)
         return -1;
     }
 
+    if (frame == NULL)
+    {
+        MBUS_ERROR("%s: Invalid frame.\n", __PRETTY_FUNCTION__);
+        return -1;
+    }
+
     result = handle->recv(handle, frame);
-    
+
     if (frame != NULL)
     {
         /* set timestamp to receive time */
@@ -1645,6 +1651,8 @@ mbus_sendrecv_request(mbus_handle *handle, int address, mbus_frame *reply, int m
     //
     next_frame = reply;
     
+    memset((void *)&reply_data, 0, sizeof(mbus_frame_data));
+    
     while (more_frames)
     {
         frame_count++;