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

plugins.cpp localize.cpp: fix possible segfault

Browse Source
This commit is contained in:
satbaby
2012-04-24 13:36:16 +02:00
parent 6cfd4da52e
commit 1fdb76af51
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/plugins.cpp
View File

@@ -42,6 +42,7 @@
#include <dlfcn.h> #include <dlfcn.h>
#include <unistd.h> #include <unistd.h>
#include <stdio.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
@@ -325,12 +326,16 @@ void CPlugins::startScriptPlugin(int number)
FILE *f = popen(script,"r"); FILE *f = popen(script,"r");
if (f != NULL) if (f != NULL)
{ {
char output[1024]; char *output=NULL;
while (fgets(output,1024,f)) size_t len = 0;
while (( getline(&output, &len, f)) != -1)
{ {
scriptOutput += output; scriptOutput += output;
} }
pclose(f); pclose(f);
if(output)
free(output);
} }
else else
{ {

8
src/system/localize.cpp
View File

@@ -149,13 +149,14 @@ CLocaleManager::loadLocale_ret_t CLocaleManager::loadLocale(const char * const l
} }
} }
char buf[1000]; char *buf=NULL;
size_t len = 0;
i = 1; i = 1;
while(!feof(fd)) while(!feof(fd))
{ {
if(fgets(buf,sizeof(buf),fd)!=NULL) if(getline(&buf, &len, fd)!=-1)
{ {
char * val = NULL; char * val = NULL;
char * tmpptr = buf; char * tmpptr = buf;
@@ -203,6 +204,9 @@ CLocaleManager::loadLocale_ret_t CLocaleManager::loadLocale(const char * const l
} }
} }
fclose(fd); fclose(fd);
if(buf)
free(buf);
for (unsigned j = 1; j < (sizeof(locale_real_names)/sizeof(const char *)); j++) for (unsigned j = 1; j < (sizeof(locale_real_names)/sizeof(const char *)); j++)
if (loadData[j] == locale_real_names[j]) if (loadData[j] == locale_real_names[j])
{ {