a3x/transpub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #13 from moyamo/wiretag-fix

Browse source 
Pass only expected data to parseFromString
This commit is contained in:
Steffen Vogel 2015-10-09 20:26:27 +02:00
parent 4497b2c5c9 652a9f0463
commit 4c86463be8
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Spectrum2/backend.py
View file

@ -3,6 +3,7 @@ import socket
import struct import struct
import sys import sys
import os import os
import logging
import google.protobuf import google.protobuf
@ -24,6 +25,7 @@ class SpectrumBackend:
self.m_pingReceived = False self.m_pingReceived = False
self.m_data = "" self.m_data = ""
self.m_init_res = 0 self.m_init_res = 0
self.logger = logging.getLogger(self.__class__.__name__)
def handleMessage(self, user, legacyName, msg, nickname = "", xhtml = "", timestamp = ""): def handleMessage(self, user, legacyName, msg, nickname = "", xhtml = "", timestamp = ""):
m = protocol_pb2.ConversationMessage() m = protocol_pb2.ConversationMessage()
@ -347,10 +349,18 @@ class SpectrumBackend:
else: else:
return return
packet = self.m_data[4:4+expected_size]
wrapper = protocol_pb2.WrapperMessage() wrapper = protocol_pb2.WrapperMessage()
if (wrapper.ParseFromString(self.m_data[4:]) == False): try:
parseFromString = wrapper.ParseFromString(packet)
except:
self.m_data = self.m_data[expected_size+4:] self.m_data = self.m_data[expected_size+4:]
self.logger.error("Parse from String exception")
return
if parseFromString == False:
self.m_data = self.m_data[expected_size+4:]
self.logger.error("Parse from String failed")
return return
self.m_data = self.m_data[4+expected_size:] self.m_data = self.m_data[4+expected_size:]