Skip to content

Commit f7f8caa

Browse files
committed
Prevent undefined behaviour when an appender is deleted without being closed
1 parent 824563d commit f7f8caa

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

src/main/cpp/filewatchdog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ struct FileWatchdog::FileWatchdogPrivate{
4141
#if LOG4CXX_EVENTS_AT_EXIT
4242
, atExitRegistryRaii([this]{stopWatcher();})
4343
#endif
44-
{}
44+
{ stopWatcher(); }
4545
/**
4646
The name of the file to observe for changes.
4747
*/

src/main/cpp/telnetappender.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ struct TelnetAppender::TelnetAppenderPriv : public AppenderSkeletonPrivate
5252
#if LOG4CXX_EVENTS_AT_EXIT
5353
, atExitRegistryRaii([this]{stopAcceptingConnections();})
5454
#endif
55-
{}
55+
{ stopAcceptingConnections(); }
5656

5757
int port;
5858
ConnectionList connections;

src/main/include/log4cxx/private/socketappenderskeleton_priv.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ struct SocketAppenderSkeleton::SocketAppenderSkeletonPriv : public AppenderSkele
4242
#if LOG4CXX_EVENTS_AT_EXIT
4343
, atExitRegistryRaii([this]{stopMonitor();})
4444
#endif
45-
{}
45+
{ stopMonitor(); }
4646

4747
SocketAppenderSkeletonPriv(helpers::InetAddressPtr address, int defaultPort, int reconnectionDelay) :
4848
AppenderSkeletonPrivate(),
@@ -54,7 +54,7 @@ struct SocketAppenderSkeleton::SocketAppenderSkeletonPriv : public AppenderSkele
5454
#if LOG4CXX_EVENTS_AT_EXIT
5555
, atExitRegistryRaii([this]{stopMonitor();})
5656
#endif
57-
{}
57+
{ stopMonitor(); }
5858

5959
SocketAppenderSkeletonPriv(const LogString& host, int port, int delay) :
6060
AppenderSkeletonPrivate(),
@@ -66,7 +66,7 @@ struct SocketAppenderSkeleton::SocketAppenderSkeletonPriv : public AppenderSkele
6666
#if LOG4CXX_EVENTS_AT_EXIT
6767
, atExitRegistryRaii([this]{stopMonitor();})
6868
#endif
69-
{}
69+
{ stopMonitor(); }
7070

7171
/**
7272
host name

src/test/cpp/net/telnetappendertestcase.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ class TelnetAppenderTestCase : public AppenderSkeletonTestCase
118118
#endif
119119
LOG4CXX_INFO(root, "Hello, World " << i);
120120
}
121-
appender->close();
122121
}
123122

124123
};

0 commit comments

Comments
 (0)