mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-22 10:19:57 +01:00
* photoid.c (generate_photo_id): Check for the JPEG magic numbers
instead of JFIF since some programs generate an EXIF header first. This is issue 1331.
This commit is contained in:
parent
d0a9b8a9fb
commit
fc1680abdf
@ -1,3 +1,9 @@
|
|||||||
|
2011-04-05 David Shaw <dshaw@jabberwocky.com>
|
||||||
|
|
||||||
|
* photoid.c (generate_photo_id): Check for the JPEG magic numbers
|
||||||
|
instead of JFIF since some programs generate an EXIF header first.
|
||||||
|
This is issue 1331.
|
||||||
|
|
||||||
2011-02-23 Werner Koch <wk@g10code.com>
|
2011-02-23 Werner Koch <wk@g10code.com>
|
||||||
|
|
||||||
* Makefile.am (LDADD): Move LIBREADLINE to ..
|
* Makefile.am (LDADD): Move LIBREADLINE to ..
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/* photoid.c - photo ID handling code
|
/* photoid.c - photo ID handling code
|
||||||
* Copyright (C) 2001, 2002, 2005, 2006, 2008 Free Software Foundation, Inc.
|
* Copyright (C) 2001, 2002, 2005, 2006, 2008, 2011 Free Software Foundation, Inc.
|
||||||
*
|
*
|
||||||
* This file is part of GnuPG.
|
* This file is part of GnuPG.
|
||||||
*
|
*
|
||||||
@ -139,8 +139,7 @@ generate_photo_id(PKT_public_key *pk,const char *photo_name)
|
|||||||
iobuf_close(file);
|
iobuf_close(file);
|
||||||
|
|
||||||
/* Is it a JPEG? */
|
/* Is it a JPEG? */
|
||||||
if(photo[0]!=0xFF || photo[1]!=0xD8 ||
|
if(photo[0]!=0xFF || photo[1]!=0xD8)
|
||||||
photo[6]!='J' || photo[7]!='F' || photo[8]!='I' || photo[9]!='F')
|
|
||||||
{
|
{
|
||||||
log_error(_("`%s' is not a JPEG file\n"),filename);
|
log_error(_("`%s' is not a JPEG file\n"),filename);
|
||||||
xfree(photo);
|
xfree(photo);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user