There was no dying due to this bug, it was trapped during deserialization, not serialization.

This reverts commit a0119e9e82.
This commit is contained in:
Colin Kuskie 2011-01-10 13:53:13 -08:00
parent a0119e9e82
commit c65fd1946a
2 changed files with 6 additions and 11 deletions

View file

@ -27,7 +27,6 @@
- fixed #11976: Use Container URL in search gives user Permission Denied
- fixed #11985: Search.pl should warn on bad assets
- fixed #12008: Activity CleanLoginHistory is too slow
- fixed #12002: Errors parsing JSON for EXIF in Gallery
7.10.6
- fixed #11974: Toolbar icons unclickable in Webkit using HTML5

View file

@ -549,17 +549,13 @@ sub updateExifDataFromFile {
}
# Remove other, pointless, possibly harmful keys
delete @{ $info }{qw( Directory NativeDigest CameraID CameraType )};
for my $key ( qw( Directory NativeDigest CameraID CameraType ) ) {
delete $info->{ $key };
}
my $json = eval { to_json ($info) };
if ($@) {
$self->session->log->warn('Bad EXIF data in image file for Photo asset '. $self->getId .', unable to convert to JSON');
}
else {
$self->update({
exifData => $json,
});
}
$self->update({
exifData => to_json( $info ),
});
}
#----------------------------------------------------------------------------