diff --git a/code/ryzom/client/src/interface_v3/group_html.cpp b/code/ryzom/client/src/interface_v3/group_html.cpp index ba53686f2..006ea1785 100644 --- a/code/ryzom/client/src/interface_v3/group_html.cpp +++ b/code/ryzom/client/src/interface_v3/group_html.cpp @@ -2625,7 +2625,7 @@ void CGroupHTML::handle () _URL = home(); string finalUrl; - lookupLocalFile (finalUrl, _URL.c_str(), true); + bool isLocal = lookupLocalFile (finalUrl, _URL.c_str(), true); // Reset the title if(_TitlePrefix.empty()) @@ -2664,7 +2664,12 @@ void CGroupHTML::handle () C3WSmartPtr uri = HTParse(finalUrl.c_str(), NULL, PARSE_ALL); // Create an anchor +#ifdef NL_OS_WINDOWS if ((_LibWWW->Anchor = HTAnchor_findAddress(uri)) == NULL) +#else + // temporarily disable local URL's until LibWWW can be replaced. + if (isLocal || ((_LibWWW->Anchor = HTAnchor_findAddress(uri)) == NULL)) +#endif { browseError((string("The page address is malformed : ")+(const char*)uri).c_str()); } diff --git a/code/ryzom/common/src/game_share/xml_auto_ptr.cpp b/code/ryzom/common/src/game_share/xml_auto_ptr.cpp index ebe4113e6..4fcdb9543 100644 --- a/code/ryzom/common/src/game_share/xml_auto_ptr.cpp +++ b/code/ryzom/common/src/game_share/xml_auto_ptr.cpp @@ -14,9 +14,13 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . - +/* + * Completely implemented in xml_auto_ptr.h + */ #include "stdpch.h" + +/* #include "xml_auto_ptr.h" #include @@ -45,10 +49,4 @@ CXMLAutoPtr &CXMLAutoPtr::operator = (const char *other) return *this; } - - - - - - - +*/ diff --git a/code/ryzom/common/src/game_share/xml_auto_ptr.h b/code/ryzom/common/src/game_share/xml_auto_ptr.h index 8744b9ae4..70a011a00 100644 --- a/code/ryzom/common/src/game_share/xml_auto_ptr.h +++ b/code/ryzom/common/src/game_share/xml_auto_ptr.h @@ -28,7 +28,7 @@ class CXMLAutoPtr public: CXMLAutoPtr(const char *value = NULL) : _Value(value) {} CXMLAutoPtr(const unsigned char *value) : _Value((const char *) value) {} - ~CXMLAutoPtr(); + ~CXMLAutoPtr() { destroy(); } operator const char *() const { return _Value; } operator bool() const { return _Value != NULL; } operator std::string() const { return std::string(_Value); } @@ -36,7 +36,14 @@ public: operator const unsigned char *() const { return (const unsigned char *) _Value; } const char operator * () const { nlassert(_Value); return *_Value; } /// NB : This remove previous owned pointer with xmlFree - CXMLAutoPtr &operator = (const char *other); + CXMLAutoPtr &operator = (const char *other) + { + if (other == _Value) return *this; + destroy(); + _Value = other; + return *this; + } + CXMLAutoPtr &operator = (const unsigned char *other) { *this = (const char *) other; @@ -47,7 +54,15 @@ public: private: const char *_Value; private: - void destroy(); + void destroy() + { + if (_Value) + { + xmlFree(const_cast(_Value)); + _Value = NULL; + } + } + // We'd rather avoid problems CXMLAutoPtr(const CXMLAutoPtr &/* other */) {