Permalink
Browse files

Correct sanity check on SET_BOOKMARK protocol command

The SET_BOOKMARK backend protocol command performed a sanity check to
ensure there were four arguments (plus command) sent to it, however
after 1508085, two of the arguments denoting a 64-bit value were merged
to a single argument, and it only used three.  This updates the sanity
check to match.

A brief search does not so any instance of this actually being used int
the code, so this does not merit updating the protocol version.

Fixes #11104
  • Loading branch information...
wagnerrp committed Jul 20, 2013
1 parent 7595f00 commit a8722faea68e8f7d2bb12f31bf78d6bc272dbdde
Showing with 2 additions and 2 deletions.
  1. +2 −2 mythtv/programs/mythbackend/mainserver.cpp
@@ -780,7 +780,7 @@ void MainServer::ProcessRequestWork(MythSocket *sock)
}
else if (command == "SET_BOOKMARK")
{
if (tokens.size() != 5)
if (tokens.size() != 4)
LOG(VB_GENERAL, LOG_ERR, "Bad SET_BOOKMARK");
else
HandleSetBookmark(tokens, pbs);
@@ -4930,7 +4930,7 @@ void MainServer::HandleSetBookmark(QStringList &tokens,
PlaybackSock *pbs)
{
// Bookmark query
// Format: SET_BOOKMARK <chanid> <starttime> <long part1> <long part2>
// Format: SET_BOOKMARK <chanid> <starttime> <position>
// chanid is chanid, starttime is startime of program in
// # of seconds since Jan 1, 1970, in UTC time. Same format as in
// a ProgramInfo structure in a string list. The two longs are the two

0 comments on commit a8722fa

Please sign in to comment.