Ticket #7886: mainserver_cpp.patch
File mainserver_cpp.patch, 1.4 KB (added by , 14 years ago) |
---|
-
mainserver.cpp
546 546 } 547 547 else if (command == "MESSAGE") 548 548 { 549 if ( listline[1].left(11) == "SET_VERBOSE")549 if ((listline.size >= 2) && (listline[1].left(11) == "SET_VERBOSE")) 550 550 HandleSetVerbose(listline, pbs); 551 551 else 552 552 HandleMessage(listline, pbs); … … 640 640 VERBOSE(VB_IMPORTANT, "Bad SHUTDOWN_NOW query"); 641 641 else if (!ismaster) 642 642 { 643 QString halt_cmd = listline[1]; 643 QString halt_cmd; 644 if (listline.size() >= 2) 645 halt_cmd = listline[1]; 644 646 if (!halt_cmd.isEmpty()) 645 647 { 646 648 VERBOSE(VB_IMPORTANT, … … 1592 1594 */ 1593 1595 void MainServer::HandleQueryRecording(QStringList &slist, PlaybackSock *pbs) 1594 1596 { 1597 if (slist.size() < 3) 1598 { 1599 VERBOSE(VB_IMPORTANT, "Bad QUERY_RECORDING query"); 1600 return; 1601 } 1602 1595 1603 MythSocket *pbssock = pbs->getSocket(); 1596 1604 QString command = slist[1].toUpper(); 1597 1605 ProgramInfo *pginfo = NULL; … … 1602 1610 } 1603 1611 else if (command == "TIMESLOT") 1604 1612 { 1613 if (slist.size() < 4) 1614 { 1615 VERBOSE(VB_IMPORTANT, "Bad QUERY_RECORDING query"); 1616 return; 1617 }; 1605 1618 pginfo = ProgramInfo::GetProgramFromRecorded(slist[2], slist[3]); 1606 1619 } 1607 1620