pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-07 18:23:14 +02:00
Code Activity

Fixed crash on access del + valgrind errors

Browse Source
This commit is contained in:
Adam
2012-05-10 17:53:53 -04:00
parent d5ffae0e46
commit 9370b063d0
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/serialize.h
+4 -4
View File
@@ -216,7 +216,7 @@ class serialize_obj : public dynamic_reference_base
this->ref->DelReference(this);
}
virtual operator bool() const
inline operator bool() const
{
if (!this->invalid)
return this->ref != NULL;
@@ -235,7 +235,7 @@ class serialize_obj : public dynamic_reference_base
this->ref->AddReference(this);
}
virtual inline operator T*() const
inline operator T*() const
{
if (!this->invalid)
{
@@ -248,7 +248,7 @@ class serialize_obj : public dynamic_reference_base
return NULL;
}
virtual inline T* operator*() const
inline T* operator*() const
{
if (!this->invalid)
{
@@ -261,7 +261,7 @@ class serialize_obj : public dynamic_reference_base
return NULL;
}
virtual inline T* operator->() const
inline T* operator->() const
{
if (!this->invalid)
{
src/access.cpp
+1 -2
View File
@@ -118,8 +118,7 @@ Serializable* ChanAccess::unserialize(Serializable *obj, Serialize::Data &data)
if (obj)
access = anope_dynamic_static_cast<ChanAccess *>(obj);
else
access = const_cast<ChanAccess *>(aprovider->Create());
access->provider = aprovider;
access = aprovider->Create();
access->ci = ci;
data["mask"] >> access->mask;
data["creator"] >> access->creator;
src/misc.cpp
+1 -1
View File
@@ -669,7 +669,7 @@ bool Anope::Match(const Anope::string &str, const Anope::string &mask, bool case
}
}
if (mask[m] == '*')
if (m < mask_len && mask[m] == '*')
++m;
return m == mask_len;
src/regchannel.cpp
-1
View File
@@ -638,7 +638,6 @@ void ChannelInfo::EraseAccess(const ChanAccess *taccess)
{
if (this->GetAccess(i) == taccess)
{
this->GetAccess(i)->destroy();
this->EraseAccess(i);
break;
}