Code: Alles auswählen
RCS file: /cvs/tuxbox/apps/tuxbox/neutrino/src/gui/themes.cpp,v
retrieving revision 1.8
diff -u -r1.8 themes.cpp
--- a/themes.cpp 27 Jan 2009 02:24:19 -0000 1.8
+++ b/themes.cpp 26 Mar 2009 18:02:52 -0000
@@ -160,6 +160,7 @@
themes.addItem(GenericMenuSeparatorLine);
themes.addItem(m1);
} else {
+ delete m1;
printf("[neutrino theme] error accessing %s\n", USERDIR);
}
Code: Alles auswählen
Index: tuxboxapi/controlapi.cpp
===================================================================
RCS file: /cvs/tuxbox/apps/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.cpp,v
retrieving revision 1.17
diff -u -r1.17 controlapi.cpp
--- a/tuxboxapi/controlapi.cpp 11 Mar 2009 20:42:15 -0000 1.17
+++ b/tuxboxapi/controlapi.cpp 26 Mar 2009 18:05:28 -0000
@@ -1950,6 +1950,7 @@
CConfigFile *Config = new CConfigFile(',');
Config->loadConfig(NEUTRINO_CONFIGFILE);
_rec_dir = Config->getString("recording_dir_0", "/mnt/filme");
+ delete Config;
}
if(changeApids)
eventinfo.apids = apids;
Index: tuxboxapi/neutrinoyparser.cpp
===================================================================
RCS file: /cvs/tuxbox/apps/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoyparser.cpp,v
retrieving revision 1.5
diff -u -r1.5 neutrinoyparser.cpp
--- a/tuxboxapi/neutrinoyparser.cpp 18 Feb 2009 17:47:26 -0000 1.5
+++ b/tuxboxapi/neutrinoyparser.cpp 26 Mar 2009 18:05:28 -0000
@@ -970,6 +970,7 @@
CConfigFile *Config = new CConfigFile(',');
Config->loadConfig(NEUTRINO_CONFIGFILE);
hh->ParamList["timer_recordingDir"] = Config->getString("network_nfs_recordingdir", "/mnt/filme");
+ delete Config;
}
hh->ParamList["standby"] = (cmd == "new")? "0" : ((timer.standby_on)?"1":"0");
hh->ParamList["message"] = (cmd == "new")? "" : timer.message;
Code: Alles auswählen
Index: pictureviewer/png.cpp
===================================================================
RCS file: /cvs/tuxbox/apps/tuxbox/neutrino/src/driver/pictureviewer/png.cpp,v
retrieving revision 1.13
diff -u -r1.13 png.cpp
--- a/pictureviewer/png.cpp 24 Jun 2007 11:40:49 -0000 1.13
+++ b/pictureviewer/png.cpp 26 Mar 2009 18:07:12 -0000
@@ -39,7 +39,10 @@
if(!(fh=fopen(name,"rb"))) return(FH_ERROR_FILE);
png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,NULL,NULL,NULL);
- if(png_ptr == NULL) return(FH_ERROR_FORMAT);
+ if(png_ptr == NULL){
+ fclose(fh);
+ return(FH_ERROR_FORMAT);
+ }
info_ptr = png_create_info_struct(png_ptr);
if(info_ptr == NULL)
{
@@ -119,7 +122,10 @@
if(!(fh=fopen(name,"rb"))) return(FH_ERROR_FILE);
png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,NULL,NULL,NULL);
- if(png_ptr == NULL) return(FH_ERROR_FORMAT);
+ if(png_ptr == NULL){
+ fclose(fh);
+ return(FH_ERROR_FORMAT);
+ }
info_ptr = png_create_info_struct(png_ptr);
if(info_ptr == NULL)
{
Code: Alles auswählen
RCS file: /cvs/tuxbox/apps/tuxbox/neutrino/src/driver/pictureviewer/jpeg.cpp,v
retrieving revision 1.10
diff -u -r1.10 jpeg.cpp
--- a/jpeg.cpp 24 Jun 2007 11:40:49 -0000 1.10
+++ b/jpeg.cpp 26 Mar 2009 18:13:15 -0000
@@ -64,7 +64,7 @@
struct pic_data pd;
strncpy(path, filename, PICV_CLIENT_SERVER_PATHLEN-1);
- path[PICV_CLIENT_SERVER_PATHLEN]=0;
+ path[PICV_CLIENT_SERVER_PATHLEN-1]=0;
dbout("fh_jpeg_load_via_server (%s/%d/%d) {\n",basename(filename),x,y);
if ((s=socket(AF_INET, SOCK_STREAM, IPPROTO_TCP))==-1)
. Compile ist grade durchgelaufen 