Unverified Commit 9e58e11a authored by AUTOMATIC1111's avatar AUTOMATIC1111 Committed by GitHub
Browse files

Merge pull request #13028 from AUTOMATIC1111/fallback-invalid-exif

Add Fallback at images.read_info_from_image if exif data was invalid
parents 4c4d7dd0 f593cbfe
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -724,7 +724,12 @@ def read_info_from_image(image: Image.Image) -> tuple[str | None, dict]:
    geninfo = items.pop('parameters', None)

    if "exif" in items:
        exif = piexif.load(items["exif"])
        exif_data = items["exif"]
        try:
            exif = piexif.load(exif_data)
        except OSError:
            # memory / exif was not valid so piexif tried to read from a file
            exif = None
        exif_comment = (exif or {}).get("Exif", {}).get(piexif.ExifIFD.UserComment, b'')
        try:
            exif_comment = piexif.helper.UserComment.load(exif_comment)