PATCH: error checking for fnt2fon.c
Marcus Meissner
marcus at jet.franken.de
Sat Apr 8 03:17:51 CDT 2006
Hi,
with FORTIFY_SOURCE=2 and glibc 2.4 we have again more warnings.
This fixes them in fnt2fon.c, by checking the return values of fwrite
and fread.
Ciao, Marcus
Changelog:
Check return values of fread and fwrite.
Index: tools/fnt2fon.c
===================================================================
RCS file: /home/wine/wine/tools/fnt2fon.c,v
retrieving revision 1.5
diff -u -r1.5 fnt2fon.c
--- tools/fnt2fon.c 7 Dec 2005 12:39:15 -0000 1.5
+++ tools/fnt2fon.c 8 Apr 2006 08:16:45 -0000
@@ -99,6 +99,7 @@
IMAGE_OS2_HEADER NE_hdr;
NE_TYPEINFO rc_type;
NE_NAMEINFO rc_name;
+ size_t fret;
if(argc < 3) {
usage(argv);
@@ -114,16 +115,20 @@
usage(argv);
exit(1);
}
- fread(&ver, sizeof(short), 1, fp);
- if(ver != 0x200 && ver != 0x300) {
+ fret = fread(&ver, sizeof(short), 1, fp);
+ if((fret != 1) || (ver != 0x200 && ver != 0x300)) {
error("invalid fnt file %s ver %d", argv[i+1], ver);
}
- fread(file_lens + i, sizeof(int), 1, fp);
+ fret = fread(file_lens + i, sizeof(int), 1, fp);
+ if (fret != 1) error("fread file_lens + i failed");
fseek(fp, 0x44, SEEK_SET);
- fread(&pt, sizeof(short), 1, fp);
- fread(dpi, sizeof(short), 2, fp);
+ fret = fread(&pt, sizeof(short), 1, fp);
+ if (fret != 1) error("fread &pt failed");
+ fret = fread(dpi, sizeof(short), 2, fp);
+ if (fret != 1) error("fread dpi failed");
fseek(fp, 0x69, SEEK_SET);
- fread(&off, sizeof(long), 1, fp);
+ fret = fread(&off, sizeof(long), 1, fp);
+ if (fret != 1) error("fread &off failed");
fseek(fp, off, SEEK_SET);
cp = name;
while((c = fgetc(fp)) != 0 && c != EOF)
@@ -179,16 +184,20 @@
ofp = fopen(argv[argc - 1], "wb");
- fwrite(MZ_hdr, sizeof(MZ_hdr), 1, ofp);
- fwrite(&NE_hdr, sizeof(NE_hdr), 1, ofp);
+ fret = fwrite(MZ_hdr, sizeof(MZ_hdr), 1, ofp);
+ if (fret != 1) error("fwrite of MZ_hdr");
+ fret = fwrite(&NE_hdr, sizeof(NE_hdr), 1, ofp);
+ if (fret != 1) error("fwrite of NE_hdr");
align = 4;
- fwrite(&align, sizeof(align), 1, ofp);
+ fret = fwrite(&align, sizeof(align), 1, ofp);
+ if (fret != 1) error("fwrite of align");
rc_type.type_id = NE_RSCTYPE_FONTDIR;
rc_type.count = 1;
rc_type.resloader = 0;
- fwrite(&rc_type, sizeof(rc_type), 1, ofp);
+ fret = fwrite(&rc_type, sizeof(rc_type), 1, ofp);
+ if (fret != 1) error("fwrite of rc_type");
rc_name.offset = fontdir_off >> 4;
rc_name.length = (fontdir_len + 15) >> 4;
@@ -196,12 +205,14 @@
rc_name.id = resident_name_off - sizeof("FONTDIR") - NE_hdr.ne_rsrctab;
rc_name.handle = 0;
rc_name.usage = 0;
- fwrite(&rc_name, sizeof(rc_name), 1, ofp);
+ fret = fwrite(&rc_name, sizeof(rc_name), 1, ofp);
+ if (fret != 1) error("fwrite of &rc_name");
rc_type.type_id = NE_RSCTYPE_FONT;
rc_type.count = num_files;
rc_type.resloader = 0;
- fwrite(&rc_type, sizeof(rc_type), 1, ofp);
+ fret = fwrite(&rc_type, sizeof(rc_type), 1, ofp);
+ if (fret != 1) error("fwrite of &rc_type");
for(res = first_res | 0x8000, i = 0; i < num_files; i++, res++) {
int len = (file_lens[i] + 15) & ~0xf;
@@ -212,26 +223,31 @@
rc_name.id = res;
rc_name.handle = 0;
rc_name.usage = 0;
- fwrite(&rc_name, sizeof(rc_name), 1, ofp);
+ fret = fwrite(&rc_name, sizeof(rc_name), 1, ofp);
+ if (fret != 1) error("fwrite of &rc_name");
font_off += len;
}
/* empty type info */
memset(&rc_type, 0, sizeof(rc_type));
- fwrite(&rc_type, sizeof(rc_type), 1, ofp);
+ fret = fwrite(&rc_type, sizeof(rc_type), 1, ofp);
+ if (fret != 1) error("fwrite of &rc_type");
fputc(strlen("FONTDIR"), ofp);
- fwrite("FONTDIR", strlen("FONTDIR"), 1, ofp);
+ fret = fwrite("FONTDIR", strlen("FONTDIR"), 1, ofp);
+ if (fret != 1) error("fwrite of FONTDIR");
fputc(strlen(resident_name), ofp);
- fwrite(resident_name, strlen(resident_name), 1, ofp);
+ fret = fwrite(resident_name, strlen(resident_name), 1, ofp);
+ if (fret != 1) error("fwrite of resident_name");
fputc(0x00, ofp); fputc(0x00, ofp);
fputc(0x00, ofp);
fputc(0x00, ofp); fputc(0x00, ofp);
fputc(strlen(non_resident_name), ofp);
- fwrite(non_resident_name, strlen(non_resident_name), 1, ofp);
+ fret = fwrite(non_resident_name, strlen(non_resident_name), 1, ofp);
+ if (fret != 1) error("fwrite of resident_name");
fputc(0x00, ofp); /* terminator */
/* empty ne_modtab and ne_imptab */
@@ -245,24 +261,29 @@
fputc(0x00, ofp);
/* FONTDIR resource */
- fwrite(&num_files, sizeof(num_files), 1, ofp);
+ fret = fwrite(&num_files, sizeof(num_files), 1, ofp);
+ if (fret != 1) error("fwrite of &num_files");
for(res = first_res, i = 0; i < num_files; i++, res++) {
fp = fopen(argv[i+1], "rb");
- fwrite(&res, sizeof(res), 1, ofp);
- fread(buf, 0x72, 1, fp);
+ fret = fwrite(&res, sizeof(res), 1, ofp);
+ if (fret != 1) error("fwrite of &res");
+ fret = fread(buf, 0x72, 1, fp);
+ if (fret != 1) error("fread of buf");
fnt_header = (struct _fnt_header *)buf;
fseek(fp, fnt_header->fi.dfFace, SEEK_SET);
fnt_header->fi.dfBitsOffset = 0;
- fwrite(buf, 0x72, 1, ofp);
+ fret = fwrite(buf, 0x72, 1, ofp);
+ if (fret != 1) error("fwrite of buf");
cp = name;
while((c = fgetc(fp)) != 0 && c != EOF)
*cp++ = c;
*cp = '\0';
- fwrite(name, strlen(name) + 1, 1, ofp);
+ fret = fwrite(name, strlen(name) + 1, 1, ofp);
+ if (fret != 1) error("fwrite of name");
fclose(fp);
}
@@ -278,7 +299,8 @@
while(1) {
nread = read(fileno(fp), buf, sizeof(buf));
if(!nread) break;
- fwrite(buf, nread, 1, ofp);
+ fret = fwrite(buf, nread, 1, ofp);
+ if (fret != 1) error("fwrite of buf");
}
fclose(fp);
pad = file_lens[i] & 0xf;
More information about the wine-patches
mailing list