WebSVN – tpanel – Diff – /trunk/texpat++.cpp

     DECL_TRACER("TExpat::getElement(const string &name, int depth)");
     vector<_ELEMENT_t>::iterator iter, startElement;
     bool start = false;
-    if (mLastIter != mElements.end())
+    if (mElements.size() > 0 && mLastIter != mElements.end())
         startElement = mLastIter;
-    else
+    else if (mElements.size() > 0)
         startElement = mElements.begin();
+    else
+    {
+        MSG_DEBUG("Have no elements in queue!");
+        return string();
+    }
     for (iter = startElement; iter != mElements.end(); ++iter)
+    {
         if (!start && iter->depth == depth && iter->eType != _ET_END)
             start = true;
     DECL_TRACER("TExpat::getElementIndex(const string& name, int depth)");
     vector<_ELEMENT_t>::iterator iter;
     size_t idx = 0;
+    if (mElements.size() == 0)
+    {
+        mLastIter = mElements.end();
+        return npos;
+    }
     for (iter = mElements.begin(); iter != mElements.end(); ++iter)
+    {
         if (iter->eType != _ET_END && iter->name.compare(name) == 0 && iter->depth == depth)
+        {
             mLastIter = iter;
+{
     DECL_TRACER("TExpat::getAttribute(const string& name, vector<ATTRIBUTE_t>& attrs)");
     vector<ATTRIBUTE_t>::iterator iter;
+    if (attrs.size() == 0)
+        return string();
     for (iter = attrs.begin(); iter != attrs.end(); ++iter)
+    {
         if (iter->name.compare(name) == 0)
             return iter->content;
+    }

Subversion Repositories tpanel