Skip to content

Commit

Permalink
fix regression - replace missing initialization for is_reloc_rtn
Browse files Browse the repository at this point in the history
This is a fix for this issue: lroathe#5

A comparison to the original Merlin32 1.0 source shows that the init section
used to contain this line.  It should be set to 0 every time the function is
called.
  • Loading branch information
digarok committed Oct 6, 2020
1 parent 55fbc94 commit cd3688f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions Source/Dc_Library.c
Original file line number Diff line number Diff line change
Expand Up @@ -3931,6 +3931,7 @@ int64_t EvalExpressionAsInteger(char *expression_param, char *buffer_error_rtn,

/* Init */
strcpy(buffer_error_rtn,"");
*is_reloc_rtn = 0;
*byte_count_rtn = (BYTE)(current_line->nb_byte - 1); /* Size of the Operand */
*expression_address_rtn = 0xFFFFFFFF; /* This is not a long address */
is_pea_opcode = current_line->opcode_byte == 0xF4 /*PEA*/;
Expand Down
2 changes: 1 addition & 1 deletion Source/version.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#ifndef MERLIN_VERSION
#define MERLIN_VERSION "v1.1.9"
#define MERLIN_VERSION "v1.1.10"
#endif

0 comments on commit cd3688f

Please sign in to comment.