[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-440-gcf5068a
Tuxbox Sources
Brought to you by:
dbt1
Menu
▾
▴
[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-440-gcf5068a
|
From: GetAway <tux...@ne...> - 2014-11-18 13:45:49
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via cf5068a2199ba084d381239034416c9b7e439d1a (commit)
via 1811dd687d49d69fe586fcc3f03862da48b8e8d1 (commit)
from 53892c778ab918e2874c6faef96dffaa257ce95f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit cf5068a2199ba084d381239034416c9b7e439d1a
Author: Christian Schuett <Gau...@ho...>
Date: Tue Nov 11 19:43:31 2014 +0100
sectionsd: disable suspicious code
I have no clue what this code should do, so let's disable it for now.
Signed-off-by: Christian Schuett <Gau...@ho...>
Signed-off-by: GetAway <get...@t-...>
diff --git a/tuxbox/neutrino/daemons/sectionsd/sectionsd.cpp b/tuxbox/neutrino/daemons/sectionsd/sectionsd.cpp
index 1d074a4..a1e7c83 100644
--- a/tuxbox/neutrino/daemons/sectionsd/sectionsd.cpp
+++ b/tuxbox/neutrino/daemons/sectionsd/sectionsd.cpp
@@ -3211,9 +3211,10 @@ static void commandCurrentNextInfoChannelID(int connfd, char *data, const unsign
nextEvt = findNextSIeventForServiceUniqueKey(*uniqueServiceKey, zeitEvt2);
}
+#if 0
if (nextEvt.service_id != 0)
{
- MySIeventsOrderUniqueKey::iterator eFirst = mySIeventsOrderUniqueKey.find(*uniqueServiceKey);
+ MySIeventsOrderUniqueKey::iterator eFirst = mySIeventsOrderUniqueKey.find(*uniqueServiceKey); // FIXME: why search for channel ID in a map of event IDs?
if (eFirst != mySIeventsOrderUniqueKey.end())
{
@@ -3227,11 +3228,12 @@ static void commandCurrentNextInfoChannelID(int connfd, char *data, const unsign
time_t azeit = time(NULL);
if (eFirst->second->times.begin()->startzeit < azeit &&
- eFirst->second->uniqueKey() == nextEvt.uniqueKey() - 1)
+ eFirst->second->uniqueKey() == nextEvt.uniqueKey() - 1) // FIXME: why this?
flag |= CSectionsdClient::epgflags::has_no_current;
}
}
}
+#endif
}
}
if (nextEvt.service_id != 0)
commit 1811dd687d49d69fe586fcc3f03862da48b8e8d1
Author: GetAway <get...@t-...>
Date: Mon Nov 10 20:37:34 2014 +0100
tuxmaild: fix array access out of bounds
fix possible resource leak
Signed-off-by: GetAway <get...@t-...>
diff --git a/tuxbox/plugins/tuxmail/daemon/tuxmaild.c b/tuxbox/plugins/tuxmail/daemon/tuxmaild.c
index a7351ba..b8d7b46 100644
--- a/tuxbox/plugins/tuxmail/daemon/tuxmaild.c
+++ b/tuxbox/plugins/tuxmail/daemon/tuxmaild.c
@@ -370,7 +370,7 @@ int ReadConf()
fprintf(fd_conf, "INBOX%d=%s\n", loop, account_db[loop].inbox);
fprintf(fd_conf, "SSL%d=%d\n", loop, account_db[loop].ssl);
- if(!account_db[loop + 1].name[0])
+ if(loop < 9 && !account_db[loop + 1].name[0])
{
break;
}
@@ -3769,7 +3769,7 @@ int CheckAccount(int account)
}
fd_idx = fopen("/tmp/tuxmaild.idx", "w+");
-
+
// generate listing
if(fd_status)
@@ -3791,11 +3791,13 @@ int CheckAccount(int account)
{
free(known_uids);
- if(fd_status)
- {
+ if(fd_status) {
fclose(fd_status);
}
-
+ if(fd_idx) {
+ fclose(fd_idx);
+ }
+
return 0;
}
}
@@ -3805,11 +3807,13 @@ int CheckAccount(int account)
{
free(known_uids);
- if(fd_status)
- {
+ if(fd_status) {
fclose(fd_status);
}
-
+ if(fd_idx) {
+ fclose(fd_idx);
+ }
+
return 0;
}
}
@@ -3822,11 +3826,13 @@ int CheckAccount(int account)
{
free(known_uids);
- if(fd_status)
- {
+ if(fd_status) {
fclose(fd_status);
}
-
+ if(fd_idx) {
+ fclose(fd_idx);
+ }
+
return 0;
}
}
@@ -3837,11 +3843,13 @@ int CheckAccount(int account)
{
free(known_uids);
- if(fd_status)
- {
+ if(fd_status) {
fclose(fd_status);
}
-
+ if(fd_idx) {
+ fclose(fd_idx);
+ }
+
return 0;
}
@@ -3849,11 +3857,13 @@ int CheckAccount(int account)
{
free(known_uids);
- if(fd_status)
- {
+ if(fd_status) {
fclose(fd_status);
}
-
+ if(fd_idx) {
+ fclose(fd_idx);
+ }
+
return 0;
}
@@ -3863,11 +3873,13 @@ int CheckAccount(int account)
{
free(known_uids);
- if(fd_status)
- {
+ if(fd_status) {
fclose(fd_status);
}
-
+ if(fd_idx) {
+ fclose(fd_idx);
+ }
+
return 0;
}
}
@@ -3883,11 +3895,13 @@ int CheckAccount(int account)
{
free(known_uids);
- if(fd_status)
- {
+ if(fd_status) {
fclose(fd_status);
}
-
+ if(fd_idx) {
+ fclose(fd_idx);
+ }
+
return 0;
}
}
@@ -3897,11 +3911,13 @@ int CheckAccount(int account)
{
free(known_uids);
- if(fd_status)
- {
+ if(fd_status) {
fclose(fd_status);
}
-
+ if(fd_idx) {
+ fclose(fd_idx);
+ }
+
return 0;
}
}
@@ -3937,11 +3953,12 @@ int CheckAccount(int account)
{
free(known_uids);
- if(fd_status)
- {
+ if(fd_status) {
fclose(fd_status);
}
-
+ if(fd_idx) {
+ fclose(fd_idx);
+ }
return 0;
}
}
@@ -3955,7 +3972,9 @@ int CheckAccount(int account)
{
fclose(fd_status);
}
-
+ if(fd_idx) {
+ fclose(fd_idx);
+ }
return 0;
}
}
@@ -4008,7 +4027,9 @@ int CheckAccount(int account)
{
fclose(fd_status);
}
-
+ if(fd_idx) {
+ fclose(fd_idx);
+ }
return 0;
}
}
@@ -4023,7 +4044,9 @@ int CheckAccount(int account)
{
fclose(fd_status);
}
-
+ if(fd_idx) {
+ fclose(fd_idx);
+ }
return 0;
}
@@ -4031,11 +4054,12 @@ int CheckAccount(int account)
{
free(known_uids);
- if(fd_status)
- {
+ if(fd_status) {
fclose(fd_status);
}
-
+ if(fd_idx) {
+ fclose(fd_idx);
+ }
return 0;
}
@@ -4045,11 +4069,12 @@ int CheckAccount(int account)
{
free(known_uids);
- if(fd_status)
- {
+ if(fd_status) {
fclose(fd_status);
}
-
+ if(fd_idx) {
+ fclose(fd_idx);
+ }
return 0;
}
}
@@ -4063,11 +4088,12 @@ int CheckAccount(int account)
{
free(known_uids);
- if(fd_status)
- {
+ if(fd_status) {
fclose(fd_status);
}
-
+ if(fd_idx) {
+ fclose(fd_idx);
+ }
return 0;
}
}
@@ -4077,11 +4103,12 @@ int CheckAccount(int account)
{
free(known_uids);
- if(fd_status)
- {
+ if(fd_status) {
fclose(fd_status);
}
-
+ if(fd_idx) {
+ fclose(fd_idx);
+ }
return 0;
}
}
@@ -4180,6 +4207,12 @@ int CheckAccount(int account)
{
if(!SendPOPCommand(RSET, "", account_db[account].ssl))
{
+ if(fd_status) {
+ fclose(fd_status);
+ }
+ if(fd_idx) {
+ fclose(fd_idx);
+ }
return 0;
}
}
@@ -4193,13 +4226,10 @@ int CheckAccount(int account)
free(known_uids);
- if(fd_idx)
- {
+ if(fd_idx) {
fclose(fd_idx);
}
-
- if(fd_status)
- {
+ if(fd_status) {
fclose(fd_status);
}
}
@@ -4800,7 +4830,7 @@ void SigHandler(int signal)
int main(int argc, char **argv)
{
- char cvs_revision[] = "$Revision: 1.53 $";
+ char cvs_revision[] = "$Revision: 1.54 $";
int param, nodelay = 0, account, mailstatus, unread_mailstatus;
pthread_t thread_id;
void *thread_result = 0;
-----------------------------------------------------------------------
Summary of changes:
tuxbox/neutrino/daemons/sectionsd/sectionsd.cpp | 6 +-
tuxbox/plugins/tuxmail/daemon/tuxmaild.c | 130 ++++++++++++++---------
2 files changed, 84 insertions(+), 52 deletions(-)
--
Tuxbox-GIT: apps
|
