From: cristy Date: Wed, 9 Jun 2010 01:07:28 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~9244 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2b5db107088f4f2566b347a4c739e7c6c66477aa;p=imagemagick --- diff --git a/ChangeLog b/ChangeLog index 6a542f813..6b332957f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2010-06-08 6.6.2-4 Cristy + * End of string sentinal is \n not \r. + 2010-06-06 6.6.2-3 Glenn Randers-Pehrson * Don't decode pixels in coders/png.c when image->ping is set. diff --git a/magick/blob.c b/magick/blob.c index b02d9381d..d3ab9f650 100644 --- a/magick/blob.c +++ b/magick/blob.c @@ -3328,9 +3328,11 @@ MagickExport char *ReadBlobString(Image *image,char *string) break; } string[i]=(char) (*p); - if ((string[i] == '\n') || (string[i] == '\r')) + if ((string[i] == '\r') || (string[i] == '\n')) break; } + if (string[i] == '\r') + (void) ReadBlobStream(image,1,buffer,&count); string[i]='\0'; return(string); }