Skip to content

Commit 4e87a80

Browse files
committed
Fixed four coverity issues
1 parent dea8416 commit 4e87a80

2 files changed

Lines changed: 14 additions & 8 deletions

File tree

src/hdf/dataobject.c

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ static int readOHDRHeaderMessageDataLayout(struct READER *reader,
521521
if (fseek(reader->fhd, data_address, SEEK_SET) < 0)
522522
return errno;
523523
if (!data->data) {
524-
if (size < 0 || size > 0x10000000)
524+
if (size > 0x10000000)
525525
return MYSOFA_INVALID_FORMAT;
526526
data->data_len = size;
527527
data->data = calloc(1, size);
@@ -862,20 +862,25 @@ static int readOHDRHeaderMessageAttribute(struct READER *reader,
862862
free(name);
863863
return MYSOFA_INVALID_FORMAT;
864864
}
865-
if (version == 1)
866-
if (fseek(reader->fhd, (8 - datatype_size) & 7, SEEK_CUR) < 0)
865+
if (version == 1) {
866+
if (fseek(reader->fhd, (8 - datatype_size) & 7, SEEK_CUR) < 0) {
867+
free(name);
867868
return errno;
869+
}
870+
}
868871

869872
err = readOHDRHeaderMessageDataspace(reader, &d.ds);
870873
if (err) {
871874
mylog("object OHDR attribute message read dataspace error\n");
872875
free(name);
873876
return MYSOFA_INVALID_FORMAT;
874877
}
875-
if (version == 1)
876-
if (fseek(reader->fhd, (8 - dataspace_size) & 7, SEEK_CUR) < 0)
878+
if (version == 1) {
879+
if (fseek(reader->fhd, (8 - dataspace_size) & 7, SEEK_CUR) < 0) {
880+
free(name);
877881
return errno;
878-
882+
}
883+
}
879884
err = readData(reader, &d, &d.dt, &d.ds);
880885
if (err) {
881886
mylog("object OHDR attribute message read data error\n");

src/tests/multithread.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,9 @@ void *thread(void *arg) {
9292
sdiff2 = sdiff2 / (count - err);
9393
}
9494
#ifdef VDEBUG
95-
printf("errors %f%% diffs %f %f\n", err * 100. / count,
96-
sdiff1 / (count - err), sdiff2 / (count - err));
95+
if (count != 0 && count != err)
96+
printf("errors %f%% diffs %f %f\n", err * 100. / count,
97+
sdiff1 / (count - err), sdiff2 / (count - err));
9798
#endif
9899
if (!(err < 31.7 && sdiff1 < 1.67 && sdiff2 < 1.43)) {
99100
abort();

0 commit comments

Comments
 (0)