0 pointer will not inserted into list

1 files changed, 4 insertions, 0 deletions

diff --git a/libopie2/opiecore/okeyfilter.cpp b/libopie2/opiecore/okeyfilter.cpp
index b064272..a517333 100644
--- a/libopie2/opiecore/okeyfilter.cpp
+++ b/libopie2/opiecore/okeyfilter.cpp
@@ -59,86 +59,90 @@ OKeyFilter::OKeyFilter()
 
 OKeyFilter::~OKeyFilter()
 {
 }
 
 OKeyFilter* OKeyFilter::inst()
 {
     static OKeyFilter*ofilter = 0;
     if (!ofilter) {
         ofilter = new OKeyFilterPrivate;
     }
     return ofilter;
 }
 
 bool OKeyFilterPrivate::filter( int unicode, int keycode, int modifiers, bool isPress, bool autoRepeat )
 {
     QValueList<QWSServer::KeyboardFilter*>::Iterator iter;
     for (iter=preFilterList.begin();iter!=preFilterList.end();++iter) {
         if ((*iter)->filter(unicode,keycode,modifiers,isPress,autoRepeat)) {
             return true;
         }
     }
     for (iter=filterList.begin();iter!=filterList.end();++iter) {
         if ((*iter)->filter(unicode,keycode,modifiers,isPress,autoRepeat)) {
             return true;
         }
     }
     return false;
 }
 
 void OKeyFilterPrivate::addHandler(QWSServer::KeyboardFilter*aF)
 {
+    if (!aF) return;
     if (filterList.find(aF)!=filterList.end()) {
         return;
     }
     odebug << "adding a keyboard filter handler"<<oendl;
     filterList.append(aF);
 }
 
 void OKeyFilterPrivate::remHandler(QWSServer::KeyboardFilter*aF)
 {
+    if (!aF) return;
     QValueList<QWSServer::KeyboardFilter*>::Iterator iter;
     if ( (iter=filterList.find(aF))==filterList.end() ) {
         return;
     }
     odebug << "removing a keyboard filter handler"<<oendl;
     filterList.remove(iter);
 }
 
 void OKeyFilterPrivate::addPreHandler(QWSServer::KeyboardFilter*aF)
 {
+    if (!aF) return;
     if (preFilterList.find(aF)!=preFilterList.end()) {
         return;
     }
     odebug << "adding a preferred keyboard filter handler"<<oendl;
     preFilterList.append(aF);
 }
 
 void OKeyFilterPrivate::remPreHandler(QWSServer::KeyboardFilter*aF)
 {
+    if (!aF) return;
     QValueList<QWSServer::KeyboardFilter*>::Iterator iter;
     if ( (iter=preFilterList.find(aF))==preFilterList.end() ) {
         return;
     }
     odebug << "removing a preferred keyboard filter handler"<<oendl;
     preFilterList.remove(iter);
 }
 
 OKeyFilterPrivate::OKeyFilterPrivate()
     :OKeyFilter(),QWSServer::KeyboardFilter()
 {
     filterList.clear();
     preFilterList.clear();
     if ( isQWS( ) ) {
         QWSServer::setKeyboardFilter ( this );
     }
 }
 
 OKeyFilterPrivate::~OKeyFilterPrivate()
 {
 }
 
 /* namespace Core */
 }
 /* namespace Opie */
 }