| author | eilers <eilers> | 2003-07-07 16:19:47 (UTC) |
|---|---|---|
| committer | eilers <eilers> | 2003-07-07 16:19:47 (UTC) |
| commit | 7fed22ccbc1272fe0c5fb1c7f47bc330f118b854 (patch) (side-by-side diff) | |
| tree | 73bd04b4fa6592f2a4caeee503c9a32ac89e24e8 | |
| parent | 1c24ec58bd7fc8a0a46cdaf41e4c6b7e68e4dba6 (diff) | |
| download | opie-7fed22ccbc1272fe0c5fb1c7f47bc330f118b854.zip opie-7fed22ccbc1272fe0c5fb1c7f47bc330f118b854.tar.gz opie-7fed22ccbc1272fe0c5fb1c7f47bc330f118b854.tar.bz2 | |
Fixing serious bug in hasQuerySettings()
| -rw-r--r-- | libopie/pim/ocontactaccessbackend_xml.cpp | 22 | ||||
| -rw-r--r-- | libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp | 22 |
2 files changed, 44 insertions, 0 deletions
diff --git a/libopie/pim/ocontactaccessbackend_xml.cpp b/libopie/pim/ocontactaccessbackend_xml.cpp index 661cd51..097142b 100644 --- a/libopie/pim/ocontactaccessbackend_xml.cpp +++ b/libopie/pim/ocontactaccessbackend_xml.cpp @@ -17,6 +17,9 @@ * ===================================================================== * History: * $Log$ + * Revision 1.6 2003/07/07 16:19:47 eilers + * Fixing serious bug in hasQuerySettings() + * * Revision 1.5 2003/04/13 18:07:10 zecke * More API doc * QString -> const QString& @@ -447,9 +450,26 @@ bool OContactAccessBackend_XML::hasQuerySettings (uint querySettings) const * Wildcards, RegExp, ExactMatch should never used at the same time... */ + // Step 1: Check whether the given settings are supported by this backend + if ( ( querySettings & ( + OContactAccess::IgnoreCase + | OContactAccess::WildCards + | OContactAccess::DateDiff + | OContactAccess::DateYear + | OContactAccess::DateMonth + | OContactAccess::DateDay + | OContactAccess::RegExp + | OContactAccess::ExactMatch + ) ) != querySettings ) + return false; + + // Step 2: Check whether the given combinations are ok.. + + // IngoreCase alone is invalid if ( querySettings == OContactAccess::IgnoreCase ) return false; + // WildCards, RegExp and ExactMatch should never used at the same time switch ( querySettings & ~( OContactAccess::IgnoreCase | OContactAccess::DateDiff | OContactAccess::DateYear @@ -463,6 +483,8 @@ bool OContactAccessBackend_XML::hasQuerySettings (uint querySettings) const return ( true ); case OContactAccess::ExactMatch: return ( true ); + case 0: // one of the upper removed bits were set.. + return ( true ); default: return ( false ); } diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp index 661cd51..097142b 100644 --- a/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp +++ b/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp @@ -17,6 +17,9 @@ * ===================================================================== * History: * $Log$ + * Revision 1.6 2003/07/07 16:19:47 eilers + * Fixing serious bug in hasQuerySettings() + * * Revision 1.5 2003/04/13 18:07:10 zecke * More API doc * QString -> const QString& @@ -447,9 +450,26 @@ bool OContactAccessBackend_XML::hasQuerySettings (uint querySettings) const * Wildcards, RegExp, ExactMatch should never used at the same time... */ + // Step 1: Check whether the given settings are supported by this backend + if ( ( querySettings & ( + OContactAccess::IgnoreCase + | OContactAccess::WildCards + | OContactAccess::DateDiff + | OContactAccess::DateYear + | OContactAccess::DateMonth + | OContactAccess::DateDay + | OContactAccess::RegExp + | OContactAccess::ExactMatch + ) ) != querySettings ) + return false; + + // Step 2: Check whether the given combinations are ok.. + + // IngoreCase alone is invalid if ( querySettings == OContactAccess::IgnoreCase ) return false; + // WildCards, RegExp and ExactMatch should never used at the same time switch ( querySettings & ~( OContactAccess::IgnoreCase | OContactAccess::DateDiff | OContactAccess::DateYear @@ -463,6 +483,8 @@ bool OContactAccessBackend_XML::hasQuerySettings (uint querySettings) const return ( true ); case OContactAccess::ExactMatch: return ( true ); + case 0: // one of the upper removed bits were set.. + return ( true ); default: return ( false ); } |