From 85d4fed65f3a97bdee202744b4262604c17af3b7 Mon Sep 17 00:00:00 2001
From: Berserker <noemail@noemail.com>
Date: Thu, 13 Jun 2019 00:24:19 +0300
Subject: [PATCH] Fixed Externalize functions to always return allocated
 buffer, even if source is empty string

---
 Vfs.dproj     |  6 +++++-
 VfsExport.pas | 16 ++++------------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/Vfs.dproj b/Vfs.dproj
index e89a8aa..3997d9d 100644
--- a/Vfs.dproj
+++ b/Vfs.dproj
@@ -30,7 +30,11 @@
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType>VCLApplication</Borland.ProjectType>
     <BorlandProject>
-<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">True</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">3</VersionInfo><VersionInfo Name="Build">2</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1049</VersionInfo><VersionInfo Name="CodePage">1251</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Alexander Shostak (aka EtherniDee)</VersionInfoKeys><VersionInfoKeys Name="FileDescription">Virtual File System</VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.3.2</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">Vfs.dpr</Source></Source><Excluded_Packages>
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">True</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">4</VersionInfo><VersionInfo Name="Build">1</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1049</VersionInfo><VersionInfo Name="CodePage">1251</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Alexander Shostak (aka EtherniDee)</VersionInfoKeys><VersionInfoKeys Name="FileDescription">Virtual File System</VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.4.1</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">Vfs.dpr</Source></Source><Excluded_Packages>
+      
+      
+      
+      
       
       
       
diff --git a/VfsExport.pas b/VfsExport.pas
index 13cc881..fe09653 100644
--- a/VfsExport.pas
+++ b/VfsExport.pas
@@ -26,22 +26,14 @@ exports
 
 function Externalize (const Str: AnsiString): {O} pointer; overload;
 begin
-  result := nil;
-
-  if Str <> '' then begin
-    GetMem(result, Length(Str) + 1);
-    Utils.CopyMem(Length(Str) + 1, pointer(Str), result);
-  end;
+  GetMem(result, Length(Str) + 1);
+  Utils.CopyMem(Length(Str) + 1, pchar(Str), result);
 end;
 
 function Externalize (const Str: WideString): {O} pointer; overload;
 begin
-  result := nil;
-
-  if Str <> '' then begin
-    GetMem(result, (Length(Str) + 1) * sizeof(WideChar));
-    Utils.CopyMem((Length(Str) + 1) * sizeof(WideChar), pointer(Str), result);
-  end;
+  GetMem(result, (Length(Str) + 1) * sizeof(WideChar));
+  Utils.CopyMem((Length(Str) + 1) * sizeof(WideChar), PWideChar(Str), result);
 end;
 
 function MapDir (const VirtPath, RealPath: PWideChar; OverwriteExisting: boolean; Flags: integer = 0): LONGBOOL; stdcall;