Attachment #399774 for bug #544510

View | Details | Raw Unified | Return to bug 544510
Collapse All | Expand All






static void
getline_ppm(char * const line,
        size_t const size,
        FILE * const stream) {
/*----------------------------------------------------------------------------

   Exit program if the line doesn't fit in the buffer.
-----------------------------------------------------------------------------*/
    if (size > sizeof(lastInputLine))
        pm_error("INTERNAL ERROR: getline_ppm() received 'size' parameter "
                 "which is out of bounds");

    if (backup) {

               int *           const transparentP) {
/*----------------------------------------------------------------------------
  Read the header of the XPM file on stream 'stream'.  Assume the
  getline_ppm() stream is presently positioned to the beginning of the
  file and it is a Version 3 XPM file.  Leave the stream positioned
  after the header.


    unsigned int * ptab;

    /* Read the XPM signature comment */
    getline_ppm(line, sizeof(line), stream);
    if (strncmp(line, xpm3_signature, strlen(xpm3_signature)) != 0) 
        pm_error("Apparent XPM 3 file does not start with '/* XPM */'.  "
                 "First line is '%s'", xpm3_signature);

    /* Read the assignment line */
    getline_ppm(line, sizeof(line), stream);
    if (strncmp(line, "static char", 11) != 0)
        pm_error("Cannot find data structure declaration.  Expected a "
                 "line starting with 'static char', but found the line "
                 "'%s'.", line);

	/* Read the hints line */
    getline_ppm(line, sizeof(line), stream);
    /* skip the comment line if any */
    if (!strncmp(line, "/*", 2)) {
        while (!strstr(line, "*/"))
            getline_ppm(line, sizeof(line), stream);
        getline_ppm(line, sizeof(line), stream);
    }
    if (sscanf(line, "\"%u %u %u %u\",", &width, &height,
               &nColors, &charsPerPixel) != 4)

        *transparentP = -1;  /* initial value */

        for (seqNum = 0; seqNum < nColors; ++seqNum) {
            getline_ppm(line, sizeof(line), stream);
            /* skip the comment line if any */
            if (!strncmp(line, "/*", 2))
                getline_ppm(line, sizeof(line), stream);
            
            interpretXpm3ColorTableLine(line, seqNum, charsPerPixel,
                                        colors, ptab, nColors, transparentP);

               unsigned int ** const ptabP) {
/*----------------------------------------------------------------------------
  Read the header of the XPM file on stream 'stream'.  Assume the
  getline_ppm() stream is presently positioned to the beginning of the
  file and it is a Version 1 XPM file.  Leave the stream positioned
  after the header.
  

    /* Read the initial defines. */
    processedStaticChar = FALSE;
    while (!processedStaticChar) {
        getline_ppm(line, sizeof(line), stream);

        if (sscanf(line, "#define %s %d", str1, &v) == 2) {
            char *t1;

    /* If there's a monochrome color table, skip it. */
    if (!strncmp(t1, "mono", 4)) {
        for (;;) {
            getline_ppm(line, sizeof(line), stream);
            if (!strncmp(line, "static char", 11))
                break;
        }


    /* Read color table. */
    for (i = 0; i < *ncolorsP; ++i) {
        getline_ppm(line, sizeof(line), stream);

        if ((t1 = strchr(line, '"')) == NULL)
            pm_error("D error scanning color table");

       "static char ...").
    */
    for (;;) {
        getline_ppm(line, sizeof(line), stream);
        if (strncmp(line, "static char", 11) == 0)
            break;
    }

    backup = FALSE;

    /* Read the header line */
    getline_ppm(line, sizeof(line), stream);
    backup = TRUE;  /* back up so next read reads this line again */
    
    rc = sscanf(line, "/* %s */", str1);

        pm_error("Could not get %d bytes of memory for image", totalpixels);
    cursor = *dataP;
    maxcursor = *dataP + totalpixels - 1;
	getline_ppm(line, sizeof(line), stream); 
        /* read next line (first line may not always start with comment) */
    while (cursor <= maxcursor) {
        if (strncmp(line, "/*", 2) == 0) {

                             ncolors, ptab, &cursor, maxcursor);
        }
        if (cursor <= maxcursor)
            getline_ppm(line, sizeof(line), stream);
    }
    if (ptab) free(ptab);
}

Return to bug 544510

Lines 123-129 Link Here

(-)netpbm-10.51.00.orig/converter/ppm/xpmtoppm.c (-18 / +18 lines)
123		123
124		124
125	static void	125	static void
126	getline(char * const line,	126	getline_ppm(char * const line,
127	size_t const size,	127	size_t const size,
128	FILE * const stream) {	128	FILE * const stream) {
129	/*----------------------------------------------------------------------------	129	/*----------------------------------------------------------------------------
Lines 141-147 Link Here
141	Exit program if the line doesn't fit in the buffer.	141	Exit program if the line doesn't fit in the buffer.
142	-----------------------------------------------------------------------------*/	142	-----------------------------------------------------------------------------*/
143	if (size > sizeof(lastInputLine))	143	if (size > sizeof(lastInputLine))
144	pm_error("INTERNAL ERROR: getline() received 'size' parameter "	144	pm_error("INTERNAL ERROR: getline_ppm() received 'size' parameter "
145	"which is out of bounds");	145	"which is out of bounds");
146		146
147	if (backup) {	147	if (backup) {
Lines 387-393 Link Here
387	int * const transparentP) {	387	int * const transparentP) {
388	/*----------------------------------------------------------------------------	388	/*----------------------------------------------------------------------------
389	Read the header of the XPM file on stream 'stream'. Assume the	389	Read the header of the XPM file on stream 'stream'. Assume the
390	getline() stream is presently positioned to the beginning of the	390	getline_ppm() stream is presently positioned to the beginning of the
391	file and it is a Version 3 XPM file. Leave the stream positioned	391	file and it is a Version 3 XPM file. Leave the stream positioned
392	after the header.	392	after the header.
393		393
Lines 423-447 Link Here
423	unsigned int * ptab;	423	unsigned int * ptab;
424		424
425	/* Read the XPM signature comment */	425	/* Read the XPM signature comment */
426	getline(line, sizeof(line), stream);	426	getline_ppm(line, sizeof(line), stream);
427	if (strncmp(line, xpm3_signature, strlen(xpm3_signature)) != 0)	427	if (strncmp(line, xpm3_signature, strlen(xpm3_signature)) != 0)
428	pm_error("Apparent XPM 3 file does not start with '/* XPM */'. "	428	pm_error("Apparent XPM 3 file does not start with '/* XPM */'. "
429	"First line is '%s'", xpm3_signature);	429	"First line is '%s'", xpm3_signature);
430		430
431	/* Read the assignment line */	431	/* Read the assignment line */
432	getline(line, sizeof(line), stream);	432	getline_ppm(line, sizeof(line), stream);
433	if (strncmp(line, "static char", 11) != 0)	433	if (strncmp(line, "static char", 11) != 0)
434	pm_error("Cannot find data structure declaration. Expected a "	434	pm_error("Cannot find data structure declaration. Expected a "
435	"line starting with 'static char', but found the line "	435	"line starting with 'static char', but found the line "
436	"'%s'.", line);	436	"'%s'.", line);
437		437
438	/* Read the hints line */	438	/* Read the hints line */
439	getline(line, sizeof(line), stream);	439	getline_ppm(line, sizeof(line), stream);
440	/* skip the comment line if any */	440	/* skip the comment line if any */
441	if (!strncmp(line, "/*", 2)) {	441	if (!strncmp(line, "/*", 2)) {
442	while (!strstr(line, "*/"))	442	while (!strstr(line, "*/"))
443	getline(line, sizeof(line), stream);	443	getline_ppm(line, sizeof(line), stream);
444	getline(line, sizeof(line), stream);	444	getline_ppm(line, sizeof(line), stream);
445	}	445	}
446	if (sscanf(line, "\"%u %u %u %u\",", &width, &height,	446	if (sscanf(line, "\"%u %u %u %u\",", &width, &height,
447	&nColors, &charsPerPixel) != 4)	447	&nColors, &charsPerPixel) != 4)
Lines 475-484 Link Here
475	transparentP = -1; / initial value */	475	transparentP = -1; / initial value */
476		476
477	for (seqNum = 0; seqNum < nColors; ++seqNum) {	477	for (seqNum = 0; seqNum < nColors; ++seqNum) {
478	getline(line, sizeof(line), stream);	478	getline_ppm(line, sizeof(line), stream);
479	/* skip the comment line if any */	479	/* skip the comment line if any */
480	if (!strncmp(line, "/*", 2))	480	if (!strncmp(line, "/*", 2))
481	getline(line, sizeof(line), stream);	481	getline_ppm(line, sizeof(line), stream);
482		482
483	interpretXpm3ColorTableLine(line, seqNum, charsPerPixel,	483	interpretXpm3ColorTableLine(line, seqNum, charsPerPixel,
484	colors, ptab, nColors, transparentP);	484	colors, ptab, nColors, transparentP);
Lines 504-510 Link Here
504	unsigned int ** const ptabP) {	504	unsigned int ** const ptabP) {
505	/*----------------------------------------------------------------------------	505	/*----------------------------------------------------------------------------
506	Read the header of the XPM file on stream 'stream'. Assume the	506	Read the header of the XPM file on stream 'stream'. Assume the
507	getline() stream is presently positioned to the beginning of the	507	getline_ppm() stream is presently positioned to the beginning of the
508	file and it is a Version 1 XPM file. Leave the stream positioned	508	file and it is a Version 1 XPM file. Leave the stream positioned
509	after the header.	509	after the header.
510		510
Lines 525-531 Link Here
525	/* Read the initial defines. */	525	/* Read the initial defines. */
526	processedStaticChar = FALSE;	526	processedStaticChar = FALSE;
527	while (!processedStaticChar) {	527	while (!processedStaticChar) {
528	getline(line, sizeof(line), stream);	528	getline_ppm(line, sizeof(line), stream);
529		529
530	if (sscanf(line, "#define %s %d", str1, &v) == 2) {	530	if (sscanf(line, "#define %s %d", str1, &v) == 2) {
531	char *t1;	531	char *t1;
Lines 576-582 Link Here
576	/* If there's a monochrome color table, skip it. */	576	/* If there's a monochrome color table, skip it. */
577	if (!strncmp(t1, "mono", 4)) {	577	if (!strncmp(t1, "mono", 4)) {
578	for (;;) {	578	for (;;) {
579	getline(line, sizeof(line), stream);	579	getline_ppm(line, sizeof(line), stream);
580	if (!strncmp(line, "static char", 11))	580	if (!strncmp(line, "static char", 11))
581	break;	581	break;
582	}	582	}
Lines 599-605 Link Here
599		599
600	/* Read color table. */	600	/* Read color table. */
601	for (i = 0; i < *ncolorsP; ++i) {	601	for (i = 0; i < *ncolorsP; ++i) {
602	getline(line, sizeof(line), stream);	602	getline_ppm(line, sizeof(line), stream);
603		603
604	if ((t1 = strchr(line, '"')) == NULL)	604	if ((t1 = strchr(line, '"')) == NULL)
605	pm_error("D error scanning color table");	605	pm_error("D error scanning color table");
Lines 635-641 Link Here
635	"static char ...").	635	"static char ...").
636	*/	636	*/
637	for (;;) {	637	for (;;) {
638	getline(line, sizeof(line), stream);	638	getline_ppm(line, sizeof(line), stream);
639	if (strncmp(line, "static char", 11) == 0)	639	if (strncmp(line, "static char", 11) == 0)
640	break;	640	break;
641	}	641	}
Lines 741-747 Link Here
741	backup = FALSE;	741	backup = FALSE;
742		742
743	/* Read the header line */	743	/* Read the header line */
744	getline(line, sizeof(line), stream);	744	getline_ppm(line, sizeof(line), stream);
745	backup = TRUE; /* back up so next read reads this line again */	745	backup = TRUE; /* back up so next read reads this line again */
746		746
747	rc = sscanf(line, "/* %s */", str1);	747	rc = sscanf(line, "/* %s */", str1);
Lines 761-767 Link Here
761	pm_error("Could not get %d bytes of memory for image", totalpixels);	761	pm_error("Could not get %d bytes of memory for image", totalpixels);
762	cursor = *dataP;	762	cursor = *dataP;
763	maxcursor = *dataP + totalpixels - 1;	763	maxcursor = *dataP + totalpixels - 1;
764	getline(line, sizeof(line), stream);	764	getline_ppm(line, sizeof(line), stream);
765	/* read next line (first line may not always start with comment) */	765	/* read next line (first line may not always start with comment) */
766	while (cursor <= maxcursor) {	766	while (cursor <= maxcursor) {
767	if (strncmp(line, "/*", 2) == 0) {	767	if (strncmp(line, "/*", 2) == 0) {
Lines 771-777 Link Here
771	ncolors, ptab, &cursor, maxcursor);	771	ncolors, ptab, &cursor, maxcursor);
772	}	772	}
773	if (cursor <= maxcursor)	773	if (cursor <= maxcursor)
774	getline(line, sizeof(line), stream);	774	getline_ppm(line, sizeof(line), stream);
775	}	775	}
776	if (ptab) free(ptab);	776	if (ptab) free(ptab);
777	}	777	}