Attachment #435654 for bug #578968




++ unzip60-format-security/extract.c

                     */
                    Info(slide, 0x401, ((char *)slide,
                      LoadFarString(CentSigMsg), j + blknum*DIR_BLKSIZ + 1));
                    Info(slide, 0x401, ((char *)slide, "%s",
                      LoadFarString(ReportMsg)));
                    error_in_archive = PK_BADERR;
                }


#ifndef SFX
    if (no_endsig_found) {                      /* just to make sure */
        Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(EndSigMsg)));
        Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(ReportMsg)));
        if (!error_in_archive)       /* don't overwrite stronger error */
            error_in_archive = PK_WARN;
    }
++ unzip60-format-security/list.c

                Info(slide, 0x401,
                     ((char *)slide, LoadFarString(CentSigMsg), j));
                Info(slide, 0x401,
                     ((char *)slide, "%s", LoadFarString(ReportMsg)));
                return PK_BADERR;   /* sig not found */
            }
        }

            && (!G.ecrec.is_zip64_archive)
            && (memcmp(G.sig, end_central_sig, 4) != 0)
           ) {          /* just to make sure again */
            Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(EndSigMsg)));
            error_in_archive = PK_WARN;   /* didn't find sig */
        }


                Info(slide, 0x401,
                     ((char *)slide, LoadFarString(CentSigMsg), j));
                Info(slide, 0x401,
                     ((char *)slide, "%s", LoadFarString(ReportMsg)));
                return PK_BADERR;   /* sig not found */
            }
        }

  ---------------------------------------------------------------------------*/

    if (memcmp(G.sig, end_central_sig, 4)) {    /* just to make sure again */
        Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(EndSigMsg)));
        error_in_archive = PK_WARN;
    }
    if (*nmember == 0L && error_in_archive <= PK_WARN)
++ unzip60-format-security/zipinfo.c

                Info(slide, 0x401,
                     ((char *)slide, LoadFarString(CentSigMsg), j));
                Info(slide, 0x401,
                     ((char *)slide, "%s", LoadFarString(ReportMsg)));
                error_in_archive = PK_BADERR;   /* sig not found */
                break;
            }

            && (!G.ecrec.is_zip64_archive)
            && (memcmp(G.sig, end_central_sig, 4) != 0)
           ) {          /* just to make sure again */
            Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(EndSigMsg)));
            error_in_archive = PK_WARN;   /* didn't find sig */
        }


Return to bug 578968

Line Link Here

(-)file_not_specified_in_diff (-12 / +12 lines)
0	-- unzip60/extract.c	0	++ unzip60-format-security/extract.c
Lines 474-480 int extract_or_test_files(__G) /* ret Link Here
474	*/	474	*/
475	Info(slide, 0x401, ((char *)slide,	475	Info(slide, 0x401, ((char *)slide,
476	LoadFarString(CentSigMsg), j + blknum*DIR_BLKSIZ + 1));	476	LoadFarString(CentSigMsg), j + blknum*DIR_BLKSIZ + 1));
477	Info(slide, 0x401, ((char *)slide,	477	Info(slide, 0x401, ((char *)slide, "%s",
478	LoadFarString(ReportMsg)));	478	LoadFarString(ReportMsg)));
479	error_in_archive = PK_BADERR;	479	error_in_archive = PK_BADERR;
480	}	480	}
Lines 754-761 int extract_or_test_files(__G) /* ret Link Here
754		754
755	#ifndef SFX	755	#ifndef SFX
756	if (no_endsig_found) { /* just to make sure */	756	if (no_endsig_found) { /* just to make sure */
757	Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg)));	757	Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(EndSigMsg)));
758	Info(slide, 0x401, ((char *)slide, LoadFarString(ReportMsg)));	758	Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(ReportMsg)));
759	if (!error_in_archive) /* don't overwrite stronger error */	759	if (!error_in_archive) /* don't overwrite stronger error */
760	error_in_archive = PK_WARN;	760	error_in_archive = PK_WARN;
761	}	761	}
762	-- unzip60/list.c	762	++ unzip60-format-security/list.c
Lines 181-187 int list_files(__G) /* return PK-type Link Here
181	Info(slide, 0x401,	181	Info(slide, 0x401,
182	((char *)slide, LoadFarString(CentSigMsg), j));	182	((char *)slide, LoadFarString(CentSigMsg), j));
183	Info(slide, 0x401,	183	Info(slide, 0x401,
184	((char *)slide, LoadFarString(ReportMsg)));	184	((char *)slide, "%s", LoadFarString(ReportMsg)));
185	return PK_BADERR; /* sig not found */	185	return PK_BADERR; /* sig not found */
186	}	186	}
187	}	187	}
Lines 507-513 int list_files(__G) /* return PK-type Link Here
507	&& (!G.ecrec.is_zip64_archive)	507	&& (!G.ecrec.is_zip64_archive)
508	&& (memcmp(G.sig, end_central_sig, 4) != 0)	508	&& (memcmp(G.sig, end_central_sig, 4) != 0)
509	) { /* just to make sure again */	509	) { /* just to make sure again */
510	Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg)));	510	Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(EndSigMsg)));
511	error_in_archive = PK_WARN; /* didn't find sig */	511	error_in_archive = PK_WARN; /* didn't find sig */
512	}	512	}
513		513
Lines 591-597 int get_time_stamp(__G__ last_modtime, n Link Here
591	Info(slide, 0x401,	591	Info(slide, 0x401,
592	((char *)slide, LoadFarString(CentSigMsg), j));	592	((char *)slide, LoadFarString(CentSigMsg), j));
593	Info(slide, 0x401,	593	Info(slide, 0x401,
594	((char *)slide, LoadFarString(ReportMsg)));	594	((char *)slide, "%s", LoadFarString(ReportMsg)));
595	return PK_BADERR; /* sig not found */	595	return PK_BADERR; /* sig not found */
596	}	596	}
597	}	597	}
Lines 674-680 int get_time_stamp(__G__ last_modtime, n Link Here
674	---------------------------------------------------------------------------*/	674	---------------------------------------------------------------------------*/
675		675
676	if (memcmp(G.sig, end_central_sig, 4)) { /* just to make sure again */	676	if (memcmp(G.sig, end_central_sig, 4)) { /* just to make sure again */
677	Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg)));	677	Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(EndSigMsg)));
678	error_in_archive = PK_WARN;	678	error_in_archive = PK_WARN;
679	}	679	}
680	if (*nmember == 0L && error_in_archive <= PK_WARN)	680	if (*nmember == 0L && error_in_archive <= PK_WARN)
681	-- unzip60/zipinfo.c	681	++ unzip60-format-security/zipinfo.c
Lines 771-777 int zipinfo(__G) /* return PK-type err Link Here
771	Info(slide, 0x401,	771	Info(slide, 0x401,
772	((char *)slide, LoadFarString(CentSigMsg), j));	772	((char *)slide, LoadFarString(CentSigMsg), j));
773	Info(slide, 0x401,	773	Info(slide, 0x401,
774	((char *)slide, LoadFarString(ReportMsg)));	774	((char *)slide, "%s", LoadFarString(ReportMsg)));
775	error_in_archive = PK_BADERR; /* sig not found */	775	error_in_archive = PK_BADERR; /* sig not found */
776	break;	776	break;
777	}	777	}
Lines 960-966 int zipinfo(__G) /* return PK-type err Link Here
960	&& (!G.ecrec.is_zip64_archive)	960	&& (!G.ecrec.is_zip64_archive)
961	&& (memcmp(G.sig, end_central_sig, 4) != 0)	961	&& (memcmp(G.sig, end_central_sig, 4) != 0)
962	) { /* just to make sure again */	962	) { /* just to make sure again */
963	Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg)));	963	Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(EndSigMsg)));
964	error_in_archive = PK_WARN; /* didn't find sig */	964	error_in_archive = PK_WARN; /* didn't find sig */
965	}	965	}
966		966