firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-02-02 10:00:38 +01:00
Code Issues

Fixed the default memory management in fbclient.

Browse Source 
Avoid crashing the server when fbclient is used in its address space.
This commit is contained in:
dimitr 2005-02-16 08:46:48 +00:00
parent 57f17c3a06
commit c00ffe7ec0
3 changed files with 42 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builds/win32/msvc7/fbclient.vcproj
View File

@ -157,6 +157,9 @@
<Filter
Name="COMMON files"
Filter="">
<File
RelativePath="..\..\..\src\common\classes\alloc.cpp">
</File>
<File
RelativePath="..\..\..\src\common\config\config_file.cpp">
</File>

58
src/common/classes/alloc.cpp
View File

@ -247,7 +247,9 @@ namespace {
{
MemoryPool* p = MemoryPool::createPool();
fb_assert(p);
#ifndef SUPERCLIENT
MemoryPool::setContextPool(p);
#endif
return p;
}
} // anonymous namespace
@ -1699,6 +1701,42 @@ void MemoryPool::deallocate(void *block)
lock.leave();
}
MemoryPool& AutoStorage::getAutoMemoryPool() {
#ifndef SUPERCLIENT
MemoryPool* p = MemoryPool::getContextPool();
#ifdef EMBEDDED
if (! p)
{
p = getDefaultMemoryPool();
}
#endif //EMBEDDED
#else //SUPERCLIENT
MemoryPool* p = getDefaultMemoryPool();
#endif //SUPERCLIENT
fb_assert(p);
return *p;
}
#if defined(DEV_BUILD)
void AutoStorage::ProbeStack() const {
//
// AutoStorage() default constructor can be used only
// for objects on the stack. ProbeStack() uses the
// following assumptions to check it:
// 1. One and only one stack is used for all kind of variables.
// 2. Objects don't grow > 64K.
//
char ProbeVar = '\0';
const char *MyStack = &ProbeVar;
const char *ThisLocation = (const char *)this;
ptrdiff_t distance = ThisLocation - MyStack;
if (distance < 0) {
distance = -distance;
}
fb_assert(distance < 64 * 1024);
}
#endif
} // namespace Firebird
/******************************** Global functions *****************************/
@ -1741,23 +1779,3 @@ void operator delete[](void* mem) throw()
Firebird::MemoryPool::globalFree(mem);
}
#if defined(DEV_BUILD)
void Firebird::AutoStorage::ProbeStack() const {
//
// AutoStorage() default constructor can be used only
// for objects on the stack. ProbeStack() uses the
// following assumptions to check it:
// 1. One and only one stack is used for all kind of variables.
// 2. Objects don't grow > 64K.
//
char ProbeVar = '\0';
const char *MyStack = &ProbeVar;
const char *ThisLocation = (const char *)this;
ptrdiff_t distance = ThisLocation - MyStack;
if (distance < 0) {
distance = -distance;
}
fb_assert(distance < 64 * 1024);
}
#endif

16
src/common/classes/alloc.h
View File

@ -577,21 +577,7 @@ namespace Firebird
void ProbeStack() const;
#endif
public:
static MemoryPool& getAutoMemoryPool() {
#ifndef SUPERCLIENT
MemoryPool* p = MemoryPool::getContextPool();
#ifdef EMBEDDED
if (! p)
{
p = getDefaultMemoryPool();
}
#endif //EMBEDDED
#else //SUPERCLIENT
MemoryPool* p = getDefaultMemoryPool();
#endif //SUPERCLIENT
fb_assert(p);
return *p;
}
static MemoryPool& getAutoMemoryPool();
protected:
AutoStorage() : PermanentStorage(getAutoMemoryPool()) {
#if defined(DEV_BUILD)