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

Use ntohl() to read cnains number in new format

Browse Source
This commit is contained in:
Andrey A. Chernov 2002-08-31 01:05:39 +00:00
parent f1757c6ee7
commit c14170612e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libc/locale/collate.c
View File

@ -29,6 +29,7 @@
__FBSDID("$FreeBSD$");
#include "namespace.h"
#include <arpa/inet.h>
#include <rune.h>
#include <stdio.h>
#include <stdlib.h>
@ -58,6 +59,7 @@ __collate_load_tables(const char *encoding)
{
FILE *fp;
int i, saverr, chains;
uint32_t u32;
char strbuf[STR_LEN], buf[PATH_MAX];
void *TMP_substitute_table, *TMP_char_pri_table, *TMP_chain_pri_table;
static char collate_encoding[ENCODING_LEN + 1];
@ -106,13 +108,13 @@ __collate_load_tables(const char *encoding)
return (_LDP_ERROR);
}
if (chains) {
if (fread(strbuf, sizeof(strbuf), 1, fp) != 1) {
if (fread(&u32, sizeof(u32), 1, fp) != 1) {
saverr = errno;
(void)fclose(fp);
errno = saverr;
return (_LDP_ERROR);
}
if ((chains = atoi(strbuf)) < 1) {
if ((chains = (int)ntohl(u32)) < 1) {
(void)fclose(fp);
errno = EFTYPE;
return (_LDP_ERROR);