From a8722faea68e8f7d2bb12f31bf78d6bc272dbdde Mon Sep 17 00:00:00 2001 From: Raymond Wagner Date: Sat, 20 Jul 2013 10:36:59 -0400 Subject: [PATCH] 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 1508085e, 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 --- mythtv/programs/mythbackend/mainserver.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mythtv/programs/mythbackend/mainserver.cpp b/mythtv/programs/mythbackend/mainserver.cpp index 391f79837a8..907feb99808 100644 --- a/mythtv/programs/mythbackend/mainserver.cpp +++ b/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 +// Format: SET_BOOKMARK // 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