fixx off by one in reading

1 files changed, 29 insertions, 1 deletions

diff --git a/libopie2/opiepim/backend/otodoaccessxml.cpp b/libopie2/opiepim/backend/otodoaccessxml.cpp
index 22b2469..cda300b 100644
--- a/libopie2/opiepim/backend/otodoaccessxml.cpp
+++ b/libopie2/opiepim/backend/otodoaccessxml.cpp
@@ -17,6 +17,34 @@
 
 #include "otodoaccessxml.h"
 
+namespace {
+    // FROM TT again
+char *strstrlen(const char *haystack, int hLen, const char* needle, int nLen)
+{
+    char needleChar;
+    char haystackChar;
+    if (!needle || !haystack || !hLen || !nLen)
+	return 0;
+
+    const char* hsearch = haystack;
+
+    if ((needleChar = *needle++) != 0) {
+	nLen--; //(to make up for needle++)
+	do {
+	    do {
+		if ((haystackChar = *hsearch++) == 0)
+		    return (0);
+		if (hsearch >= haystack + hLen)
+		    return (0);
+	    } while (haystackChar != needleChar);
+	} while (strncmp(hsearch, needle, QMIN(hLen - (hsearch - haystack), nLen)) != 0);
+	hsearch--;
+    }
+    return ((char *)hsearch);
+}
+}
+
+
 OTodoAccessXML::OTodoAccessXML( const QString& appName,
                                 const QString& fileName )
     : OTodoAccessBackend(), m_app( appName ),  m_opened( false ), m_changed( false )
@@ -85,7 +113,7 @@ bool OTodoAccessXML::load() {
     char *point;
     const char* collectionString = "<Task ";
     int strLen = strlen(collectionString);
-    while ( dt+i != 0 && ( point = strstr( dt+i, collectionString ) ) != 0l ) {
+    while ( ( point = strstrlen( dt+i, len -i, collectionString, strLen ) ) != 0l ) {
         i = point -dt;
         i+= strLen;
         qWarning("Found a start at %d %d", i,  (point-dt) );