浏览代码

* fix shortstr_to_ansistring for 1.0.x

peter 21 年之前
父节点
当前提交
cc431c4375
共有 1 个文件被更改,包括 10 次插入2 次删除
  1. 10 2
      rtl/inc/astrings.inc

+ 10 - 2
rtl/inc/astrings.inc

@@ -249,8 +249,13 @@ end;
 { old style helper }
 { old style helper }
 {$ifndef hascompilerproc}
 {$ifndef hascompilerproc}
 Procedure fpc_ShortStr_To_AnsiStr (Var S1 : Pointer; Const S2 : ShortString);[Public, alias: 'FPC_SHORTSTR_TO_ANSISTR'];
 Procedure fpc_ShortStr_To_AnsiStr (Var S1 : Pointer; Const S2 : ShortString);[Public, alias: 'FPC_SHORTSTR_TO_ANSISTR'];
+Var
+  Size : SizeInt;
 begin
 begin
-  s1 := pointer(fpc_ShortStr_To_AnsiStr(s2));
+  Size:=Length(S2);
+  Setlength (ansistring(s1),Size);
+  if Size>0 then
+    Move(S2[1],s1^,Size);
 end;
 end;
 {$endif hascompilerproc}
 {$endif hascompilerproc}
 
 
@@ -864,7 +869,10 @@ end;
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.48  2004-10-24 20:01:41  peter
+  Revision 1.49  2004-10-31 16:21:30  peter
+    * fix shortstr_to_ansistring for 1.0.x
+
+  Revision 1.48  2004/10/24 20:01:41  peter
     * saveregisters calling convention is obsolete
     * saveregisters calling convention is obsolete
 
 
   Revision 1.47  2004/07/12 17:58:19  peter
   Revision 1.47  2004/07/12 17:58:19  peter