This is an archive of the discontinued LLVM Phabricator instance.

Differential D25967

Avoid running regex on None
ClosedPublic

Authored by azharudd on Oct 25 2016, 2:29 PM.

Details

Reviewers
mgrang
cmatthews
Commits
rL285328: Avoid running regex on None
Summary

We are attempting to run regex on version_ln even if it is None. This can cause TypeError.

Patch by Azharuddin Mohammed

Diff Detail

Repository
rL LLVM

Event Timeline

azharudd updated this revision to Diff 75792.Oct 25 2016, 2:29 PM
azharudd retitled this revision from to Avoid running regex on None.
azharudd updated this object.
azharudd added a reviewer: cmatthews.
azharudd set the repository for this revision to rL LLVM.
azharudd added a subscriber: llvm-commits.
azharudd added inline comments.Oct 25 2016, 2:33 PM
lnt/testing/util/compilers.py
85

this is the faulty line.

cmatthews accepted this revision.Oct 25 2016, 3:04 PM
cmatthews edited edge metadata.
This revision is now accepted and ready to land.Oct 25 2016, 3:04 PM
azharudd added a comment.Oct 25 2016, 4:46 PM

Chris, can you please commit this change. I do not have commit rights yet. Thanks.

azharudd added a reviewer: mgrang.Oct 27 2016, 11:02 AM
Closed by commit rL285328: Avoid running regex on None (authored by mgrang). · Explain WhyOct 27 2016, 11:39 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lnt/
testing/
util/
28 lines

Diff 75792

lnt/testing/util/compilers.py

Context not available.
if not m: if not m:
fatal("unable to determine cc1 binary: %r: %r" % (cc, ln)) fatal("unable to determine cc1 binary: %r: %r" % (cc, ln))
cc1_binary, = m.groups() cc1_binary, = m.groups()
if cc1_binary is None:
error("unable to find compiler cc1 binary: %r: %r" % (cc, cc_version))
if version_ln is None: if version_ln is None:
error("unable to find compiler version: %r: %r" % (cc, cc_version)) error("unable to find compiler version: %r: %r" % (cc, cc_version))
if cc1_binary is None:
error("unable to find compiler cc1 binary: %r: %r" % (
cc, cc_version))
m = re.match(r'(.*) version ([^ ]*) +(\([^(]*\))(.*)', version_ln)
azharuddAuthorUnsubmitted
Not Done
ReplyInline Actions

this is the faulty line.

azharudd: this is the faulty line.
if m is not None:
cc_name,cc_version_num,cc_build_string,cc_extra = m.groups()
else: else:
# If that didn't match, try a more basic pattern. m = re.match(r'(.*) version ([^ ]*) +(\([^(]*\))(.*)', version_ln)
m = re.match(r'(.*) version ([^ ]*)', version_ln)
if m is not None: if m is not None:
cc_name,cc_version_num = m.groups() cc_name,cc_version_num,cc_build_string,cc_extra = m.groups()
cc_build_string = cc_extra = ""
else: else:
error("unable to determine compiler version: %r: %r" % ( # If that didn't match, try a more basic pattern.
cc, version_ln)) m = re.match(r'(.*) version ([^ ]*)', version_ln)
cc_name = "unknown" if m is not None:
cc_version_num = cc_build_string = cc_extra = "" cc_name,cc_version_num = m.groups()
cc_build_string = cc_extra = ""
else:
error("unable to determine compiler version: %r: %r" % (
cc, version_ln))
cc_name = "unknown"
cc_version_num = cc_build_string = cc_extra = ""
# Compute normalized compiler name and type. We try to grab source # Compute normalized compiler name and type. We try to grab source
# revisions, branches, and tags when possible. # revisions, branches, and tags when possible.
Context not available.