Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix BLANK WHEN ZERO on signed NUMERIC-EDITED #201

Closed
wants to merge 3 commits into from
Closed

Fix BLANK WHEN ZERO on signed NUMERIC-EDITED #201

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
99c1c33
Fix BLANK WHEN ZERO on signed NUMERIC-EDITED
ddeclerck Dec 9, 2024
6d3e4fb
Use optimized_move_display_to_edited with all kind of sign positions
ddeclerck Dec 10, 2024
8d6312b
Fix out of bounds read
ddeclerck Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions libcob/ChangeLog
View file
Open in desktop
ddeclerck marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,19 @@
* fileio.c: fixed Bug #1032 by always using global thread-static variable
bdb_app_data pointer to access the collating sequence function

2024-12-09 David Declerck <[email protected]>

* move.c (optimized_move_display_to_edited): normalize numeric data
* move.c (cob_move): extend use of optimized_move_display_to_edited
to more cases (i.e. different source and destination sign, leading
sign, non-separate sign)

ddeclerck marked this conversation as resolved.
Show resolved Hide resolved
2024-12-09 Chuck Haatvedt <[email protected]>

* move.c (optimized_move_display_to_edited): fixed additional bug
reported with bug #1008: BLANK WHEN ZERO not working on signed
NUMERIC-EDITED fields

2024-12-08 Simon Sobisch <[email protected]>

* screenio.c [WITH_PANELS]: replace use of ncurses extension ceiling_panel()
Expand Down
99 changes: 52 additions & 47 deletions libcob/move.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1014,12 +1014,13 @@ optimized_move_display_to_edited (cob_field *f1, cob_field *f2)
register unsigned char *dst = f2->data;
register unsigned char *src = f1->data;
const cob_pic_symbol *p;
unsigned char *src_end = src + f1->size - 1;
unsigned char *src_last = src + f1->size - 1;
unsigned char *dst_end = f2->data + f2->size;
const int sign = COB_GET_SIGN (f1);

unsigned char *prev_float_char = NULL;
unsigned char *sign_position = NULL;
int neg = 0;
const int neg = (sign < 0) ? 1 : 0;
int is_zero = 1;
int suppress_zero = 1;
int have_decimal_point = 0;
Expand All @@ -1036,10 +1037,7 @@ optimized_move_display_to_edited (cob_field *f1, cob_field *f2)
correct attributes, if not then something is brokend and needs to be fixed */
if (!(COB_FIELD_TYPE (f2) == COB_TYPE_NUMERIC_EDITED
&& COB_FIELD_DIGITS (f1) == COB_FIELD_DIGITS (f2)
&& COB_FIELD_SCALE (f1) == COB_FIELD_SCALE (f2)
&& COB_FIELD_HAVE_SIGN (f1) == COB_FIELD_HAVE_SIGN (f2)
&& ((COB_FIELD_HAVE_SIGN (f1) && (!COB_FIELD_SIGN_LEADING (f1) && COB_FIELD_SIGN_SEPARATE (f1)))
|| !COB_FIELD_HAVE_SIGN (f1)))) {
&& COB_FIELD_SCALE (f1) == COB_FIELD_SCALE (f2))) {
cob_runtime_error ("optimized_move_display_to_edited: invalid argument");
}
#endif
Expand Down Expand Up @@ -1084,20 +1082,25 @@ optimized_move_display_to_edited (cob_field *f1, cob_field *f2)
}
}

/* first check for BLANK WHEN ZERO attribute */
if (COB_FIELD_HAVE_SIGN (f1) && COB_FIELD_SIGN_SEPARATE (f1) && COB_FIELD_SIGN_LEADING (f1)) {
src++;
}

/* first check for BLANK WHEN ZERO attribute */
/* Note that if the src field is signed then we */
/* scan for one less byte */
if (COB_FIELD_BLANK_ZERO (f2)) {
for (; (src <= src_end) ; src++) {
if (*src != '0') break;
}
if (src > src_end) {
memset (dst, (int)' ', (size_t)f2->size);
unsigned char *check = src;
unsigned char *check_end = COB_FIELD_HAVE_SIGN (f1) && COB_FIELD_SIGN_SEPARATE (f1) && !COB_FIELD_SIGN_LEADING (f1) ? src_last - 1 : src_last;
for (; (check <= check_end) ; check++) {
if (COB_D2I (*check) != 0) break;
}
if (check > check_end) {
memset (dst, ' ', f2->size);
/* Restore the source sign */
COB_PUT_SIGN (f1, sign);
return;
}
src = f1->data;
}

if (COB_FIELD_HAVE_SIGN (f1)) {
neg = (*src_end == '-') ? 1 : 0;
}

for (p = COB_FIELD_PIC (f2); p->symbol; ++p) {
Expand All @@ -1111,6 +1114,7 @@ optimized_move_display_to_edited (cob_field *f1, cob_field *f2)
continue;
}
for (n = p->times_repeated; n > 0; n--) {
unsigned int src_num = COB_D2I (*src);
#ifndef NDEBUG
if (dst >= dst_end) {
cob_runtime_error ("optimized_move_display_to_edited: overflow in destination field");
Expand All @@ -1121,18 +1125,18 @@ optimized_move_display_to_edited (cob_field *f1, cob_field *f2)

case '9':
suppress_zero = 0;
*dst = *src;
if (*src != '0') {
*dst = COB_I2D (src_num);
if (src_num != 0) {
is_zero = 0;
}
src++;
dst++;
break;

case 'Z':
*dst = *src;
*dst = COB_I2D (src_num);
pad = ' ';
if (*src != '0') {
if (src_num != 0) {
is_zero = suppress_zero = 0;
} else {
if (suppress_zero && (!have_decimal_point)) {
Expand All @@ -1144,9 +1148,9 @@ optimized_move_display_to_edited (cob_field *f1, cob_field *f2)
break;

case '*':
*dst = *src;
*dst = COB_I2D (src_num);
have_check_protect = 1;
if (*src != '0') {
if (src_num != 0) {
is_zero = suppress_zero = 0;
} else {
if (suppress_zero && (!have_decimal_point)) {
Expand All @@ -1170,7 +1174,7 @@ optimized_move_display_to_edited (cob_field *f1, cob_field *f2)
sign_position = dst;
dst++;
break;
} else if (*src == '0' && suppress_zero && !have_decimal_point) {
} else if (src_num == 0 && suppress_zero && !have_decimal_point) {
*prev_float_char = ' ';
prev_float_char = dst;
sign_position = dst;
Expand All @@ -1179,8 +1183,8 @@ optimized_move_display_to_edited (cob_field *f1, cob_field *f2)
src++;
break;
} else {
*dst = *src;
if (*src != '0') {
*dst = COB_I2D (src_num);
if (src_num != 0) {
is_zero = 0;
suppress_zero = 0;
}
Expand Down Expand Up @@ -1273,7 +1277,9 @@ optimized_move_display_to_edited (cob_field *f1, cob_field *f2)
cob_runtime_error ("optimized_move_display_to_edited: invalid PIC character %c", c);
*dst = '?'; /* Invalid PIC */
break;
} else if (c != float_char) {
} else
/* LCOV_EXCL_STOP */
if (c != float_char) {
*dst = c;
dst++;
break;
Expand All @@ -1282,35 +1288,37 @@ optimized_move_display_to_edited (cob_field *f1, cob_field *f2)
prev_float_char = dst;
dst++;
break;
} else if ((*src == '0') && (suppress_zero) && (!have_decimal_point)) {
} else if ((src_num == 0) && (suppress_zero) && (!have_decimal_point)) {
*prev_float_char = ' ';
prev_float_char = dst;
*dst = c;
dst++;
src++;
break;
} else {
*dst = *src;
if (*src != '0') {
*dst = COB_I2D (src_num);
if (src_num != 0) {
is_zero = 0;
suppress_zero = 0;
}
dst++;
src++;
break;
}
/* LCOV_EXCL_STOP */
} /* END OF SWITCH STATEMENT */
} /* END OF INNER FOR LOOP */
} /* END OF OUTER FOR LOOP */
}
}
}

/************************************************************/
/* after the edited string is built from the mask */
/* then the sign mask has to be adjusted according to */
/* the actual sign of the data. */
/************************************************************/
/* Restore the source sign */
COB_PUT_SIGN (f1, sign);

/* if we have not printed any digits set destination to spaces and return */
/************************************************************/
/* after the edited string is built from the mask */
/* then the sign mask has to be adjusted according to */
/* the actual sign of the data. */
/************************************************************/

/* if we have not printed any digits set destination to spaces and return */

if (suppress_zero) {
if (pad == '*') {
Expand Down Expand Up @@ -1686,15 +1694,12 @@ cob_move (cob_field *src, cob_field *dst)
cob_move_display_to_binary (src, dst);
return;
case COB_TYPE_NUMERIC_EDITED:
if (COB_FIELD_DIGITS(src) == COB_FIELD_DIGITS(dst)
&& COB_FIELD_SCALE(src) == COB_FIELD_SCALE(dst)
&& COB_FIELD_HAVE_SIGN(src) == COB_FIELD_HAVE_SIGN(dst)
&& ((COB_FIELD_HAVE_SIGN(src) && (!COB_FIELD_SIGN_LEADING(src) && COB_FIELD_SIGN_SEPARATE (src)))
|| COB_FIELD_HAVE_SIGN(src) == 0)) {
optimized_move_display_to_edited(src, dst);
if (COB_FIELD_DIGITS (src) == COB_FIELD_DIGITS (dst)
&& COB_FIELD_SCALE (src) == COB_FIELD_SCALE (dst)) {
optimized_move_display_to_edited (src, dst);
} else {
indirect_move (cob_move_display_to_display, src, dst,
(size_t)(COB_FIELD_DIGITS(src)),
(size_t)(COB_FIELD_DIGITS (src)),
COB_FIELD_SCALE (src));
}
return;
Expand Down
3 changes: 2 additions & 1 deletion tests/testsuite.src/run_file.at
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14658,7 +14658,8 @@ AT_CLEANUP
AT_SETUP([DELETE WITH COLLATING SEQUENCE])
AT_KEYWORDS([runfile WRITE DELETE READ EBCDIC])

AT_SKIP_IF([test "$COB_HAS_ISAM" != "db"])
AT_SKIP_IF([test "$COB_HAS_ISAM" = "no"])

AT_DATA([prog.cob], [
IDENTIFICATION DIVISION.
PROGRAM-ID. READDEL.
Expand Down
Loading
Loading