Переглянути джерело

* Fixed hang while linking in some cases.

git-svn-id: trunk@11508 -
yury 17 роки тому
батько
коміт
23da33b75a
1 змінених файлів з 3 додано та 3 видалено
  1. 3 3
      compiler/ogbase.pas

+ 3 - 3
compiler/ogbase.pas

@@ -2168,8 +2168,8 @@ implementation
         mergedstabstrsec : TObjSection;
         mergedstabstrsec : TObjSection;
         hstabreloc,
         hstabreloc,
         currstabreloc : TObjRelocation;
         currstabreloc : TObjRelocation;
+        i,j : longint;
         currstabrelocidx,
         currstabrelocidx,
-        i,j,
         mergestabcnt,
         mergestabcnt,
         stabcnt : longword;
         stabcnt : longword;
         skipstab : boolean;
         skipstab : boolean;
@@ -2233,12 +2233,12 @@ implementation
                           begin
                           begin
                             currstabreloc:=TObjRelocation(currstabsec.ObjRelocations[currstabrelocidx]);
                             currstabreloc:=TObjRelocation(currstabsec.ObjRelocations[currstabrelocidx]);
                             if assigned(currstabreloc) and
                             if assigned(currstabreloc) and
-                               (currstabreloc.dataoffset>=j*sizeof(TObjStabEntry)+stabrelocofs) then
+                               (currstabreloc.dataoffset>=longword(j)*sizeof(TObjStabEntry)+stabrelocofs) then
                               break;
                               break;
                             inc(currstabrelocidx);
                             inc(currstabrelocidx);
                           end;
                           end;
                         if assigned(currstabreloc) and
                         if assigned(currstabreloc) and
-                           (currstabreloc.dataoffset=j*sizeof(TObjStabEntry)+stabrelocofs) then
+                           (currstabreloc.dataoffset=longword(j)*sizeof(TObjStabEntry)+stabrelocofs) then
                           begin
                           begin
                             hstabReloc:=currstabReloc;
                             hstabReloc:=currstabReloc;
                             inc(currstabrelocidx);
                             inc(currstabrelocidx);