[Jcl-checkins-diff] SF.net SVN: jcl:[3390] trunk/jcl/source/windows/JclStructStorage.pas

[<ou...@us...>]

Revision: 3390
          http://jcl.svn.sourceforge.net/jcl/?rev=3390&view=rev
Author:   outchy
Date:     2010-10-25 09:08:45 +0000 (Mon, 25 Oct 2010)

Log Message:
-----------
Mantis 5373: TJclStructStorageFolder.IsStructured leads to invalid pointer operation in FreeWChar().

Modified Paths:
--------------
    trunk/jcl/source/windows/JclStructStorage.pas

Modified: trunk/jcl/source/windows/JclStructStorage.pas
===================================================================
--- trunk/jcl/source/windows/JclStructStorage.pas	2010-10-25 08:28:53 UTC (rev 3389)
+++ trunk/jcl/source/windows/JclStructStorage.pas	2010-10-25 09:08:45 UTC (rev 3390)
@@ -345,7 +345,7 @@
   else
   begin
     {$IFDEF SUPPORTS_UNICODE}
-    Result := PChar(S);
+    Result := PWideChar(S);
     {$ELSE ~SUPPORTS_UNICODE}
     Result := AllocMem((Length(S)+1) * SizeOf(WideChar));
     MultiByteToWideChar(CP_ACP, 0, PChar(S), Length(S), Result, Length(S));
@@ -358,8 +358,10 @@
 
 procedure FreeWChar(W: PWideChar);
 begin
+  {$IFNDEF SUPPORTS_UNICODE}
   if Assigned(W) then
     FreeMem(W);
+  {$ENDIF ~SUPPORTS_UNICODE}
 end;
 
 //=== { TJclStructStorageFolder } ============================================


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.