From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Claudio Bley Newsgroups: gmane.emacs.devel Subject: [PATCH v2 4/5] Fix parsing of NetPBM file comments Date: Wed, 30 Oct 2013 13:43:46 +0100 Message-ID: <8738njylml.wl%claudio.bley@gmail.com> References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII X-Trace: ger.gmane.org 1383137042 14499 80.91.229.3 (30 Oct 2013 12:44:02 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 30 Oct 2013 12:44:02 +0000 (UTC) To: Emacs-devel Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Oct 30 13:44:09 2013 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1VbV80-0007s8-Mr for ged-emacs-devel@m.gmane.org; Wed, 30 Oct 2013 13:44:04 +0100 Original-Received: from localhost ([::1]:52210 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VbV80-00079U-A8 for ged-emacs-devel@m.gmane.org; Wed, 30 Oct 2013 08:44:04 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58022) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VbV7q-00070W-SQ for emacs-devel@gnu.org; Wed, 30 Oct 2013 08:44:00 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VbV7l-0003H3-HJ for emacs-devel@gnu.org; Wed, 30 Oct 2013 08:43:54 -0400 Original-Received: from mail-ea0-x22b.google.com ([2a00:1450:4013:c01::22b]:41178) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VbV7l-0003Gh-83 for emacs-devel@gnu.org; Wed, 30 Oct 2013 08:43:49 -0400 Original-Received: by mail-ea0-f171.google.com with SMTP id h10so624727eak.2 for ; Wed, 30 Oct 2013 05:43:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=date:message-id:from:to:subject:in-reply-to:references:user-agent :mime-version:content-type; bh=tB6kkmUnEPXc5iayyhIHlJYzE4kJe++L8ou/VVsERFE=; b=Rl9NfJfP1amgJOjFsi80HPlf64IwxbZ+ZJ+VtQ6YZs2HXRnkBjZAnSHRyxyRuX1sVf z/W4kLi/BOmvvufZsm80Zjd71GxV/7/PyMgpZH5Xrf0iqcDxbFdzu8Gp3cJz22WZhBga BeLmMB8cKsgUE+k7vmgcE1HaH1ZghW09/pPl52cIot10PmOk8ZHWgvSZb+g9+GpYop7o lGv78NxLGOWtZmAB8T3satRUdY/713Zcth+2kdy3vY94Js2gDcZZnIQCwQCeGHSJkG4l LF4RLSNUsRWz8QAfkSiPdSJrAaWoy7xTafiLUwQ3wBNU1otnGrOK5HtwjiDPAr0jNCOK MslA== X-Received: by 10.14.6.134 with SMTP id 6mr2082299een.66.1383137028388; Wed, 30 Oct 2013 05:43:48 -0700 (PDT) Original-Received: from CLAUDIO-PC.localdomain.de (178-24-125-95-dynip.superkabel.de. [178.24.125.95]) by mx.google.com with ESMTPSA id x47sm83152794eea.16.2013.10.30.05.43.47 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Oct 2013 05:43:47 -0700 (PDT) In-Reply-To: User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/24.3.50 (i686-pc-mingw32) MULE/6.0 (HANACHIRUSATO) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4013:c01::22b X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:164697 Archived-At: Comments in NetPBM headers can occur in the middle of a token. (see http://netpbm.sourceforge.net/doc/pbm.html) --- src/image.c | 51 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/src/image.c b/src/image.c index dea3d35..afd54ac 100644 --- a/src/image.c +++ b/src/image.c @@ -5111,6 +5111,27 @@ pbm_image_p (Lisp_Object object) } +/* Get next char skipping comments in Netpbm header. Returns -1 at + end of input. */ + +static int +pbm_next_char (unsigned char **s, unsigned char *end) +{ + int c = -1; + + while (*s < end && (c = *(*s)++, c == '#')) + { + /* Skip to the next line break */ + while (*s < end && (c = *(*s)++, c != '\n' && c != '\r')) + ; + + c = -1; + } + + return c; +} + + /* Scan a decimal number from *S and return it. Advance *S while reading the number. END is the end of the string. Value is -1 at end of input. */ @@ -5120,28 +5141,16 @@ pbm_scan_number (unsigned char **s, unsigned char *end) { int c = 0, val = -1; - while (*s < end) - { - /* Skip white-space. */ - while (*s < end && (c = *(*s)++, c_isspace (c))) - ; + /* Skip white-space. */ + while ((c = pbm_next_char (s, end)) != -1 && c_isspace (c)) + ; - if (c == '#') - { - /* Skip comment to end of line. */ - while (*s < end && (c = *(*s)++, c != '\n')) - ; - } - else if (c_isdigit (c)) - { - /* Read decimal number. */ - val = c - '0'; - while (*s < end && (c = *(*s)++, c_isdigit (c))) - val = 10 * val + c - '0'; - break; - } - else - break; + if (c_isdigit (c)) + { + /* Read decimal number. */ + val = c - '0'; + while ((c = pbm_next_char (s, end)) != -1 && c_isdigit (c)) + val = 10 * val + c - '0'; } return val; -- 1.8.4.msysgit.0