Wireshark-dev: Re: [Wireshark-dev] [Wireshark-commits] rev 32006: /trunk/ /trunk/epan/: oids.c
Date Prev · Date Next · Thread Prev · Thread Next
From: Balint Reczey <[email protected]>
Date: Sat, 27 Feb 2010 20:10:24 +0100
Guy Harris wrote:
On Feb 25, 2010, at 11:29 AM, [email protected] wrote:

http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=32006

User: rbalint
Date: 2010/02/25 11:29 AM

Log:
Prevent potential crash in libsmi.
From: Vincent Bernat <[email protected]>

Directory: /trunk/epan/
 Changes    Path          Action
 +12 -0     oids.c        Modified

Directory: /trunk/tools/
 Changes    Path          Action
 +2 -2      asn2wrs.py    Modified
Was the asn2wrs.py change:

Index: asn2wrs.py
===================================================================
--- asn2wrs.py  (revision 31777)
+++ asn2wrs.py  (revision 32006)
@@ -47,8 +47,8 @@
 import getopt
 import traceback
-import lex
-import yacc
+from ply import lex
+from ply import yacc
# OID name -> number conversion table
 oid_names = {

part of Vincent's change, or was it something else?

Before the change, asn2wrs worked on OS X without having to install ply; it now complains:

Traceback (most recent call last):
  File "../../tools/asn2wrs.py", line 50, in <module>
    from ply import lex
ImportError: No module named ply

Hi Guy,

Sorry, it slipped in, I've reverted it.

The ply patch is used in the Debian package to be able to run asn2wrs in any directory without having to add the tools directory to the Python PATH.
Cheers,
Balint