paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-18 10:32:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fixed InitializeSqlite and ReleaseSqlite functions (segfault after a call

Browse Source 
to ReleaseSqlite with refcount=0)
* changed all shortstrings to ansistrings ({$h+})

git-svn-id: trunk@13719 -
This commit is contained in:
ivost 2009-09-16 08:50:42 +00:00
parent daa5984212
commit d9099daa9c
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
packages/sqlite/src/sqlite3.inc
View File

@ -1,4 +1,4 @@
{$mode objfpc}
{$mode objfpc}{$h+}
{$ifdef BSD}
{$linklib c}
@ -5725,7 +5725,7 @@ procedure ReleaseSQLite;
var
SQLiteLibraryHandle: TLibHandle;
DefaultLibrary: String = Sqlite3Lib;
SQLiteDefaultLibrary: String = Sqlite3Lib;
{$ENDIF LOAD_DYNAMICALLY}
implementation
@ -5912,46 +5912,45 @@ var
function TryInitialiseSqlite(const LibraryName: string): Boolean;
begin
Result := false;
if (RefCount=0) then
if InterlockedIncrement(RefCount) = 1 then
begin
SQLiteLibraryHandle := LoadLibrary(LibraryName);
Result := (SQLiteLibraryHandle <> nilhandle);
Result := (SQLiteLibraryHandle <> NilHandle);
if not Result then
begin
RefCount := 0;
Exit;
Inc(RefCount);
end;
LoadedLibrary := LibraryName;
LoadAddresses(SQLiteLibraryHandle);
end else begin
if (LoadedLibrary <> LibraryName) then
raise EInoutError.CreateFmt(SErrAlreadyLoaded,[LoadedLibrary]);
Inc(RefCount);
end else
Result := True;
end;
end;
procedure InitialiseSQLite;
begin
InitialiseSQLite(DefaultLibrary);
InitialiseSQLite(SQLiteDefaultLibrary);
end;
procedure InitialiseSQLite(LibraryName: String);
begin
if (LoadedLibrary <> '') and (LoadedLibrary <> LibraryName) then
raise EInoutError.CreateFmt(SErrAlreadyLoaded,[LoadedLibrary]);
if not TryInitialiseSQLIte(LibraryName) then
raise EInOutError.CreateFmt(SErrLoadFailed,[LibraryName]);
end;
procedure ReleaseSQLite;
begin
if RefCount > 1 then
Dec(RefCount)
else
if UnloadLibrary(SQLiteLibraryHandle) then
begin
Dec(RefCount);
SQLiteLibraryHandle := NilHandle;
LoadedLibrary := '';
end;
if InterlockedDecrement(RefCount) <= 0 then
begin
if SQLiteLibraryHandle <> NilHandle then
UnloadLibrary(SQLiteLibraryHandle);
SQLiteLibraryHandle := NilHandle;
LoadedLibrary := '';
RefCount := 0;
end;
end;
{$ENDIF}