Attachment #398 for bug #3883

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




	if (!(xisalnum(r[0]) || r[0] == '_' || r[0] == '/')) {
	    rpmError(RPMERR_BADSPEC,
		     _("line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s\n"),
		     spec->lineNum, (spec->fileStack ? spec->line : field));
	    return RPMERR_BADSPEC;
	}


	case RPMTAG_BUILDCONFLICTS:
	    if (r[0] == '/') {
		rpmError(RPMERR_BADSPEC,_("line %d: File name not permitted: %s\n"),
			 spec->lineNum, (spec->fileStack ? spec->line : field));
		return RPMERR_BADSPEC;
	    }
	    /*@switchbreak@*/ break;

	if (strpbrk (req, "%<=>")) {
	    rpmError(RPMERR_BADSPEC,
		     _("line %d: Dependency tokens must not contain '%%<=>' symbols: %s\n"),
		     spec->lineNum, (spec->fileStack ? spec->line : field));
	    return RPMERR_BADSPEC;
	}


	    if (r[0] == '/') {
		rpmError(RPMERR_BADSPEC,
			 _("line %d: Versioned file name not permitted: %s\n"),
			 spec->lineNum, (spec->fileStack ? spec->line : field));
		return RPMERR_BADSPEC;
	    }


	if (flags & RPMSENSE_SENSEMASK) {
	    if (*v == '\0' || ve == v) {
		rpmError(RPMERR_BADSPEC, _("line %d: Version required: %s\n"),
			spec->lineNum, (spec->fileStack ? spec->line : field));
		return RPMERR_BADSPEC;
	    }
	    version = xmalloc((ve-v) + 1);

	if (version && strpbrk (version, "%<=>")) {
	    rpmError(RPMERR_BADSPEC,
		     _("line %d: Dependency tokens must not contain '%%<=>' symbols: %s\n"),
		     spec->lineNum, (spec->fileStack ? spec->line : field));
	    req = _free(req);
	    version = _free(version);
	    return RPMERR_BADSPEC;

Return to bug 3883

Lines 99-105 int parseRCPOT(Spec spec, Package pkg, c Link Here

(-)build/parseReqs.c (-6 / +6 lines)
99	if (!(xisalnum(r[0]) \|\| r[0] == '_' \|\| r[0] == '/')) {	99	if (!(xisalnum(r[0]) \|\| r[0] == '_' \|\| r[0] == '/')) {
100	rpmError(RPMERR_BADSPEC,	100	rpmError(RPMERR_BADSPEC,
101	_("line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s\n"),	101	_("line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s\n"),
102	spec->lineNum, spec->line);	102	spec->lineNum, (spec->fileStack ? spec->line : field));
103	return RPMERR_BADSPEC;	103	return RPMERR_BADSPEC;
104	}	104	}
105		105
Lines 110-116 int parseRCPOT(Spec spec, Package pkg, c Link Here
110	case RPMTAG_BUILDCONFLICTS:	110	case RPMTAG_BUILDCONFLICTS:
111	if (r[0] == '/') {	111	if (r[0] == '/') {
112	rpmError(RPMERR_BADSPEC,_("line %d: File name not permitted: %s\n"),	112	rpmError(RPMERR_BADSPEC,_("line %d: File name not permitted: %s\n"),
113	spec->lineNum, spec->line);	113	spec->lineNum, (spec->fileStack ? spec->line : field));
114	return RPMERR_BADSPEC;	114	return RPMERR_BADSPEC;
115	}	115	}
116	/@switchbreak@/ break;	116	/@switchbreak@/ break;
Lines 128-134 int parseRCPOT(Spec spec, Package pkg, c Link Here
128	if (strpbrk (req, "%<=>")) {	128	if (strpbrk (req, "%<=>")) {
129	rpmError(RPMERR_BADSPEC,	129	rpmError(RPMERR_BADSPEC,
130	_("line %d: Dependency tokens must not contain '%%<=>' symbols: %s\n"),	130	_("line %d: Dependency tokens must not contain '%%<=>' symbols: %s\n"),
131	spec->lineNum, spec->line);	131	spec->lineNum, (spec->fileStack ? spec->line : field));
132	return RPMERR_BADSPEC;	132	return RPMERR_BADSPEC;
133	}	133	}
134		134
Lines 150-156 int parseRCPOT(Spec spec, Package pkg, c Link Here
150	if (r[0] == '/') {	150	if (r[0] == '/') {
151	rpmError(RPMERR_BADSPEC,	151	rpmError(RPMERR_BADSPEC,
152	_("line %d: Versioned file name not permitted: %s\n"),	152	_("line %d: Versioned file name not permitted: %s\n"),
153	spec->lineNum, spec->line);	153	spec->lineNum, (spec->fileStack ? spec->line : field));
154	return RPMERR_BADSPEC;	154	return RPMERR_BADSPEC;
155	}	155	}
156		156
Lines 181-187 int parseRCPOT(Spec spec, Package pkg, c Link Here
181	if (flags & RPMSENSE_SENSEMASK) {	181	if (flags & RPMSENSE_SENSEMASK) {
182	if (*v == '\0' \|\| ve == v) {	182	if (*v == '\0' \|\| ve == v) {
183	rpmError(RPMERR_BADSPEC, _("line %d: Version required: %s\n"),	183	rpmError(RPMERR_BADSPEC, _("line %d: Version required: %s\n"),
184	spec->lineNum, spec->line);	184	spec->lineNum, (spec->fileStack ? spec->line : field));
185	return RPMERR_BADSPEC;	185	return RPMERR_BADSPEC;
186	}	186	}
187	version = xmalloc((ve-v) + 1);	187	version = xmalloc((ve-v) + 1);
Lines 196-202 int parseRCPOT(Spec spec, Package pkg, c Link Here
196	if (version && strpbrk (version, "%<=>")) {	196	if (version && strpbrk (version, "%<=>")) {
197	rpmError(RPMERR_BADSPEC,	197	rpmError(RPMERR_BADSPEC,
198	_("line %d: Dependency tokens must not contain '%%<=>' symbols: %s\n"),	198	_("line %d: Dependency tokens must not contain '%%<=>' symbols: %s\n"),
199	spec->lineNum, spec->line);	199	spec->lineNum, (spec->fileStack ? spec->line : field));
200	req = _free(req);	200	req = _free(req);
201	version = _free(version);	201	version = _free(version);
202	return RPMERR_BADSPEC;	202	return RPMERR_BADSPEC;