firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 04:43:03 +01:00
Code Issues

Fixed AV, happening after use of fb_ping

Browse Source
This commit is contained in:
alexpeshkoff 2009-09-21 14:49:16 +00:00
parent d745c76af3
commit 4a172c4015
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/jrd/why.cpp
View File

@ -79,6 +79,7 @@
#include "../jrd/os/path_utils.h"
#include "../common/classes/ClumpletWriter.h"
#include "../common/utils_proto.h"
#include "../common/StatusHolder.h"
#include "../jrd/flu_proto.h"
#include "../jrd/gds_proto.h"
@ -385,7 +386,7 @@ namespace
Clean<AttachmentCleanupRoutine, FB_API_HANDLE*> cleanup;
StoredAtt* handle;
ISC_STATUS_ARRAY status;
StatusHolder status; // Do not use raise() method of this class in yValve
PathName db_path;
static ISC_STATUS hError()
@ -720,10 +721,10 @@ namespace
{
if (checkAttachment)
{
const Attachment attachment = rc->parent;
if (attachment && attachment->status[1])
Attachment attachment = rc->parent;
if (attachment && attachment->status.getError())
{
status_exception::raise(attachment->status);
status_exception::raise(attachment->status.value());
}
}
@ -768,7 +769,6 @@ namespace
db_path(getPool()),
flagDestroying(false)
{
fb_utils::init_status(status);
attachments().toParent(this);
parent = this;
}
@ -6034,9 +6034,9 @@ ISC_STATUS API_ROUTINE fb_ping(ISC_STATUS* user_status, FB_API_HANDLE* db_handle
if (CALL(PROC_PING, attachment->implementation) (status, &attachment->handle))
{
memcpy(attachment->status, status, sizeof(ISC_STATUS_ARRAY));
attachment->status.save(status);
CALL(PROC_DETACH, attachment->implementation) (status, &attachment->handle);
status_exception::raise(attachment->status);
status_exception::raise(attachment->status.value());
}
}
catch (const Exception& e)