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

remotecontrol: initialize variables and avoid overlapping strcpy

Browse Source
This commit is contained in:
Stefan Seyfried
2012-10-31 19:19:31 +01:00
parent 857cb350cb
commit 994c903913
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/daemonc/remotecontrol.cpp
View File

@@ -108,6 +108,7 @@ CRemoteControl::CRemoteControl()
// current_programm_timer = 0; // current_programm_timer = 0;
is_video_started = true; is_video_started = true;
//next_EPGid = 0; //next_EPGid = 0;
are_subchannels = false;
} }
@@ -484,7 +485,8 @@ void CRemoteControl::processAPIDnames()
for(unsigned int count=0; count< current_PIDs.APIDs.size(); count++) for(unsigned int count=0; count< current_PIDs.APIDs.size(); count++)
{ {
printf("Neutrino: apid name= %s (%s) pid= %X\n", current_PIDs.APIDs[count].desc, getISO639Description( current_PIDs.APIDs[count].desc ), current_PIDs.APIDs[count].pid); const char *iso = getISO639Description(current_PIDs.APIDs[count].desc);
printf("Neutrino: apid name= %s (%s) pid= %X\n", current_PIDs.APIDs[count].desc, iso, current_PIDs.APIDs[count].pid);
if ( current_PIDs.APIDs[count].component_tag != 0xFF ) if ( current_PIDs.APIDs[count].component_tag != 0xFF )
{ {
has_unresolved_ctags= true; has_unresolved_ctags= true;
@@ -492,7 +494,9 @@ void CRemoteControl::processAPIDnames()
if ( strlen( current_PIDs.APIDs[count].desc ) == 3 ) if ( strlen( current_PIDs.APIDs[count].desc ) == 3 )
{ {
// unaufgeloeste Sprache... // unaufgeloeste Sprache...
strcpy( current_PIDs.APIDs[count].desc, getISO639Description( current_PIDs.APIDs[count].desc ) ); /* getISO639Description returns same pointer as input if nothing is found */
if (current_PIDs.APIDs[count].desc != iso)
strcpy(current_PIDs.APIDs[count].desc, iso);
} }
if ( current_PIDs.APIDs[count].is_ac3 ) if ( current_PIDs.APIDs[count].is_ac3 )