URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=2f096100f5bcf5284111e62b51af23a9cbf4149b
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
2f09610 by Роман Донченко (dpb@xxxxxxxxxxxxxx):
cms: don't assert if eContent fails to be dissected
If eContent is not an octet string, content_tvb will be null, and
attempting to use it will trigger an assertion. Besides ill-formed
files, this can also occur in old-style PKCS #7 files, since in PKCS #7
the corresponding field has the ANY type, rather than OCTET STRING.
Change-Id: I9a5bce983aa82107a9602317737c183461cac7f3
Reviewed-on: https://code.wireshark.org/review/19448
Petri-Dish: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
Actions performed:
from e7a4c82 QUIC: Add SMHL (Support Max Header List Size) tag
adds 2f09610 cms: don't assert if eContent fails to be dissected
Summary of changes:
epan/dissectors/asn1/cms/cms.cnf | 7 +++++--
epan/dissectors/packet-cms.c | 29 ++++++++++++++++-------------
2 files changed, 21 insertions(+), 15 deletions(-)