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

* fixed shortstring constant emission after r28210: the terminating #0

Browse Source 
was no longer included, so things went wrong if the string was reused
    for a pchar

git-svn-id: trunk@32738 -
This commit is contained in:
Jonas Maebe 2015-12-26 20:01:06 +00:00
parent ea1e368328
commit aef6120438
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/ncgcon.pas
View File

@ -377,9 +377,9 @@ implementation
move(value_str^,pc[1],l);
pc[0]:=chr(l);
pc[l+1]:=#0;
datadef:=carraydef.getreusable(cansichartype,l+1);
datadef:=carraydef.getreusable(cansichartype,l+2);
datatcb.maybe_begin_aggregate(datadef);
datatcb.emit_tai(Tai_string.Create_pchar(pc,l+1),datadef);
datatcb.emit_tai(Tai_string.Create_pchar(pc,l+2),datadef);
datatcb.maybe_end_aggregate(datadef);
current_asmdata.asmlists[al_typedconsts].concatList(
datatcb.get_final_asmlist(lastlabel.lab,datadef,sec_rodata_norel,lastlabel.lab.name,const_align(sizeof(pint)))