summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelie <elie>2012-05-24 16:25:22 +0000
committerelie <elie>2012-05-24 16:25:22 +0000
commit66bfd27d4c6961a225c7607471ec53912cff0e69 (patch)
tree7c35b13ff80d70e71630cbb7e560d2118f5de1db
parentea81f00cfe336cbb516fe0885fa3a1bd42afedbc (diff)
downloadpyasn1-66bfd27d4c6961a225c7607471ec53912cff0e69.tar.gz
fixes to uninitialized decoder reference used in debug calls
-rw-r--r--pyasn1/codec/ber/decoder.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/pyasn1/codec/ber/decoder.py b/pyasn1/codec/ber/decoder.py
index ffbfd69..db3e00a 100644
--- a/pyasn1/codec/ber/decoder.py
+++ b/pyasn1/codec/ber/decoder.py
@@ -704,9 +704,10 @@ class Decoder:
state = stTryAsExplicitTag
elif tagSet == self.__endOfOctetsTagSet:
concreteDecoder = self.__tagMap[tagSet]
- debug.logger and debug.logger & debug.flagDecoder and debug.logger('end-of-octets found')
state = stDecodeValue
+ debug.logger and debug.logger & debug.flagDecoder and debug.logger('end-of-octets found')
else:
+ concreteDecoder = None
state = stTryAsExplicitTag
if debug.logger and debug.logger & debug.flagDecoder:
debug.logger('codec %s chosen by ASN.1 spec, decoding %s' % (state == stDecodeValue and concreteDecoder.__class__.__name__ or "<none>", state == stDecodeValue and 'value' or 'as explicit tag'))
@@ -719,6 +720,7 @@ class Decoder:
concreteDecoder = explicitTagDecoder
state = stDecodeValue
else:
+ concreteDecoder = None
state = self.defaultErrorState
debug.logger and debug.logger & debug.flagDecoder and debug.logger('codec %s chosen, decoding %s' % (concreteDecoder and concreteDecoder.__class__.__name__ or "<none>", state == stDecodeValue and 'value' or 'as failure'))
if state == stDumpRawValue: