Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix version parsing #730

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix version parsing #730

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions src/pyshark/tshark/tshark.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,16 @@ def get_tshark_version(tshark_path=None):
with open(os.devnull, "w") as null:
version_output = subprocess.check_output(parameters, stderr=null).decode("ascii")

version_line = version_output.splitlines()[0]
version_lines = version_output.splitlines()
version_string = None
pattern = r'.*\s(\d+\.\d+\.\d+).*' # match " #.#.#" version pattern
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Optional regex to further narrow the version

Suggested change
pattern = r'.*\s(\d+\.\d+\.\d+).*' # match " #.#.#" version pattern
pattern = r'^TShark.*?\s(\d+\.\d+\.\d+).*' # match " #.#.#" version pattern

m = re.match(pattern, version_line)
if not m:
raise TSharkVersionException("Unable to parse TShark version from: {}".format(version_line))
version_string = m.groups()[0] # Use first match found

for version_line in version_lines:
m = re.match(pattern, version_line)
if m:
version_string = m.groups()[0] # Use first match found
break
if not version_string:
raise TSharkVersionException("Unable to parse TShark version from: {}".format(version_lines))
return version.parse(version_string)


Expand Down