Fehlerbehebung der großen Funktion
This commit is contained in:
parent
d3a79ff7bc
commit
0397890940
19
imageInput.c
19
imageInput.c
@ -94,6 +94,17 @@ GrayScaleImageSeries *readImages(const char *path)
|
||||
series->images = malloc(numImages * sizeof(GrayScaleImage));
|
||||
series->labels = malloc(numImages * sizeof(unsigned char));
|
||||
|
||||
if(series->images == NULL || series->labels == NULL){
|
||||
|
||||
free(series->images); //wenn trotzdem was reingeschrieben wurde, dann freigeben
|
||||
free(series->labels);
|
||||
free(series);
|
||||
|
||||
fclose(fp);
|
||||
return NULL;
|
||||
|
||||
}
|
||||
|
||||
//Prüfen, ob der Speicher reserviert werden konnte
|
||||
for(unsigned int i = 0; i < numImages; i++){
|
||||
|
||||
@ -109,7 +120,7 @@ GrayScaleImageSeries *readImages(const char *path)
|
||||
free(series->images); //wenn trotzdem was reingeschrieben wurde, dann freigeben
|
||||
free(series->labels);
|
||||
free(series);
|
||||
|
||||
|
||||
fclose(fp);
|
||||
return NULL;
|
||||
|
||||
@ -131,7 +142,11 @@ GrayScaleImageSeries *readImages(const char *path)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
fread(&series -> labels[i], 1, 1, fp);
|
||||
if(fread(&series -> labels[i], 1, 1, fp) != 1){
|
||||
clearSeries(series);
|
||||
fclose(fp);
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user