d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Zero out the entire "struct __collate_st_chain_pri", or garbage

Browse Source 
appears in LC_COLLATE files (due to alignment).  An alternative
would be to bump STR_LEN to 16.

(This is in preparation to make LC_COLLATE files architecture
independent.)
This commit is contained in:
ru 2005-02-27 14:05:38 +00:00
parent 1c7f944f0e
commit 7157282f84
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
usr.bin/colldef/parse.y
View File

@ -118,10 +118,8 @@ order : ORDER order_list {
if ((__collate_chain_pri_table = realloc(__collate_chain_pri_table,
sizeof(*__collate_chain_pri_table) * (chain_index + 1))) == NULL)
yyerror("can't grow chain table");
(void)memset(__collate_chain_pri_table[chain_index].str, 0,
sizeof(__collate_chain_pri_table[0].str));
__collate_chain_pri_table[chain_index].prim = 0;
__collate_chain_pri_table[chain_index].sec = 0;
(void)memset(&__collate_chain_pri_table[chain_index], 0,
sizeof(__collate_chain_pri_table[0]));
chain_index++;
if ((fp = fopen(out_file, "w")) == NULL)
@ -194,11 +192,10 @@ item : CHAR {
if ((__collate_chain_pri_table = realloc(__collate_chain_pri_table,
sizeof(*__collate_chain_pri_table) * (chain_index + 1))) == NULL)
yyerror("can't grow chain table");
(void)memset(__collate_chain_pri_table[chain_index].str, 0,
sizeof(__collate_chain_pri_table[0].str));
(void)memset(&__collate_chain_pri_table[chain_index], 0,
sizeof(__collate_chain_pri_table[0]));
(void)strcpy(__collate_chain_pri_table[chain_index].str, curr_chain);
__collate_chain_pri_table[chain_index].prim = prim_pri++;
__collate_chain_pri_table[chain_index].sec = 0;
chain_index++;
}
| CHAR RANGE CHAR {
@ -249,11 +246,10 @@ prim_sub_item : CHAR {
if ((__collate_chain_pri_table = realloc(__collate_chain_pri_table,
sizeof(*__collate_chain_pri_table) * (chain_index + 1))) == NULL)
yyerror("can't grow chain table");
(void)memset(__collate_chain_pri_table[chain_index].str, 0,
sizeof(__collate_chain_pri_table[0].str));
(void)memset(&__collate_chain_pri_table[chain_index], 0,
sizeof(__collate_chain_pri_table[0]));
(void)strcpy(__collate_chain_pri_table[chain_index].str, curr_chain);
__collate_chain_pri_table[chain_index].prim = prim_pri;
__collate_chain_pri_table[chain_index].sec = 0;
chain_index++;
}
;
@ -281,8 +277,8 @@ sec_sub_item : CHAR {
if ((__collate_chain_pri_table = realloc(__collate_chain_pri_table,
sizeof(*__collate_chain_pri_table) * (chain_index + 1))) == NULL)
yyerror("can't grow chain table");
(void)memset(__collate_chain_pri_table[chain_index].str, 0,
sizeof(__collate_chain_pri_table[0].str));
(void)memset(&__collate_chain_pri_table[chain_index], 0,
sizeof(__collate_chain_pri_table[0]));
(void)strcpy(__collate_chain_pri_table[chain_index].str, curr_chain);
__collate_chain_pri_table[chain_index].prim = prim_pri;
__collate_chain_pri_table[chain_index].sec = sec_pri++;