mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 17:01:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

nhttpd: change sprintf to snprintf

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0f2ac568c8
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-03-31 (Tue, 31 Mar 2015)

Origin message was:
------------------
nhttpd: change sprintf to snprintf

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2015-03-31 14:44:41 +02:00
parent 520c7b76c5
commit 1dcbbf603d
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
View File

@@ -1958,7 +1958,7 @@ void CControlAPI::SendTimers(CyhookHandler *hh)
"Unknown TV-Channel" : "Unknown Radio-Channel"); "Unknown TV-Channel" : "Unknown Radio-Channel");
} }
else else
sprintf(zAddData, PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, timer->channel_id); snprintf(zAddData,sizeof(zAddData), PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, timer->channel_id);
zAddData[22]=0; zAddData[22]=0;
@@ -1966,7 +1966,7 @@ void CControlAPI::SendTimers(CyhookHandler *hh)
case CTimerd::TIMER_STANDBY: case CTimerd::TIMER_STANDBY:
if (!send_id) if (!send_id)
sprintf(zAddData,"Standby: %s",(timer->standby_on ? "ON" : "OFF")); snprintf(zAddData,sizeof(zAddData),"Standby: %s",(timer->standby_on ? "ON" : "OFF"));
break; break;
case CTimerd::TIMER_REMIND : case CTimerd::TIMER_REMIND :

4
src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp
View File

@@ -300,11 +300,11 @@ std::string CNeutrinoYParser::func_get_channels_as_dropdown(CyhookHandler *, st
CEPGData epg; CEPGData epg;
CZapitChannel * channel = channels[j]; CZapitChannel * channel = channels[j];
char buf[100],id[20]; char buf[100],id[20];
sprintf(id,PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS,channel->getChannelID()); snprintf(id,sizeof(id),PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS,channel->getChannelID());
std::string _sid = std::string(id); std::string _sid = std::string(id);
sel = (_sid == achannel_id) ? "selected=\"selected\"" : ""; sel = (_sid == achannel_id) ? "selected=\"selected\"" : "";
CEitManager::getInstance()->getActualEPGServiceKey(channel->getChannelID(), &epg); CEitManager::getInstance()->getActualEPGServiceKey(channel->getChannelID(), &epg);
sprintf(buf,"<option value=" PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS " %s>%.20s - %.30s</option>\n", channel->getChannelID(), sel.c_str(), channel->getName().c_str(),epg.title.c_str()); snprintf(buf,sizeof(buf),"<option value=" PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS " %s>%.20s - %.30s</option>\n", channel->getChannelID(), sel.c_str(), channel->getName().c_str(),epg.title.c_str());
yresult += buf; yresult += buf;
} }
} }

2
src/nhttpd/yhttpd_core/helper.cpp
View File

@@ -229,7 +229,7 @@ std::string encodeString(std::string decodedString) {
if (isalnum(one_char)) if (isalnum(one_char))
*newString++ = one_char; *newString++ = one_char;
else else
newString += sprintf(newString, "&#%d;", newString += snprintf(newString,result.length(), "&#%d;",
(unsigned char) one_char); (unsigned char) one_char);
} }