plugins.cpp localize.cpp: fix possible segfault

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

View File

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

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;
while(!feof(fd))
{
if(fgets(buf,sizeof(buf),fd)!=NULL)
if(getline(&buf, &len, fd)!=-1)
{
char * val = NULL;
char * tmpptr = buf;
@@ -203,6 +204,9 @@ CLocaleManager::loadLocale_ret_t CLocaleManager::loadLocale(const char * const l
}
}
fclose(fd);
if(buf)
free(buf);
for (unsigned j = 1; j < (sizeof(locale_real_names)/sizeof(const char *)); j++)
if (loadData[j] == locale_real_names[j])
{