Skip to content

Fix a bug at uPlayback when working with binary data. #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
schvarcz wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix a bug at uPlayback when working with binary data. #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions Tools/Graphical/uPlayBack/MOOSPlayBackV2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,20 +284,23 @@ bool CMOOSPlayBackV2::MessageFromLine(const std::string & sLine, CMOOSMsg &Msg)

if(sData.find("<MOOS_BINARY>") !=std::string::npos)
{

std::string sOpenTag("<MOOS_BINARY>"), sCloseTag("</MOOS_BINARY>");
std::string sBinaryDataInfo = sData.substr(sData.find(sOpenTag)+sOpenTag.size(),sData.find(sCloseTag)-sData.find(sOpenTag)-sOpenTag.size());
//Msg.MarkAsBinary();
long long nOffset;
if(!MOOSValFromString(nOffset,sData,"Offset"))
return MOOSFail("badly formed MOOS_BINARY indicator - missing \"Offset=xyz\"");

std::string sFile;
if(!MOOSValFromString(sFile,sData,"File"))
if(!MOOSValFromString(sFile,sBinaryDataInfo,"File"))
return MOOSFail("badly formed MOOS_BINARY indicator - missing \"File=XYZ\"");

double nOffset;
if(!MOOSValFromString(nOffset,sBinaryDataInfo,"Offset"))
return MOOSFail("badly formed MOOS_BINARY indicator - missing \"Offset=xyz\"");

int nBytes;
if(!MOOSValFromString(nBytes,sData,"Bytes"))
if(!MOOSValFromString(nBytes,sBinaryDataInfo,"Bytes"))
return MOOSFail("badly formed MOOS_BINARY indicator - missing \"Bytes=xyz\"");


//corner case of binary file changing half way through a log....(Why this might happen
//I don't know but catch it anyway....
if(sFile != m_sBinaryFileName && m_BinaryFile.is_open() )
Expand Down