Fix possible NULL pointer access in MobV2CAO

[minetest.git] / src / strfnd.h

diff --git a/src/strfnd.h b/src/strfnd.h
index 2be92d43b03d6b51dbf1c4907a1d16f5d268f948..e3d380e377a5233e3f7f33a099a03f661b827bbe 100644 (file)
--- a/src/strfnd.h
+++ b/src/strfnd.h
@@ -74,6 +74,56 @@ class Strfnd{
     }
 };
 
+class WStrfnd{
+    std::wstring tek;
+    unsigned int p;
+public:
+    void start(std::wstring niinq){
+        tek = niinq;
+        p=0;
+    }
+    unsigned int where(){
+        return p;
+    }
+    void to(unsigned int i){
+        p = i;
+    }
+    std::wstring what(){
+        return tek;
+    }
+    std::wstring next(std::wstring plop){
+        //std::cout<<"tek=\""<<tek<<"\" plop=\""<<plop<<"\""<<std::endl;
+        size_t n;
+        std::wstring palautus;
+        if (p < tek.size())
+        {  
+            //std::cout<<"\tp<tek.size()"<<std::endl;
+            if ((n = tek.find(plop, p)) == std::wstring::npos || plop == L"")
+            {  
+                //std::cout<<"\t\tn == string::npos || plop == \"\""<<std::endl;
+                n = tek.size();
+            }
+            else
+            {  
+                //std::cout<<"\t\tn != string::npos"<<std::endl;
+            }
+            palautus = tek.substr(p, n-p);
+            p = n + plop.length();
+        }
+        //else
+            //std::cout<<"\tp>=tek.size()"<<std::endl;
+               //std::cout<<"palautus=\""<<palautus<<"\""<<std::endl;
+        return palautus;
+    }
+    bool atend(){
+        if(p>=tek.size()) return true;
+        return false;
+    }
+    WStrfnd(std::wstring s){
+        start(s);
+    }
+};
+
 inline std::string trim(const std::string &s)
 {
        std::string str = s;