Fix a crash when oid_info->value_typem is NULL

svn path=/trunk/; revision=49894

diff --git a/asn1/snmp/packet-snmp-template.c b/asn1/snmp/packet-snmp-template.c
index 5743c6366730d57b306a01facc6e37a623e542fa..240c63bdc2e10b6a52a8e30b2217b72716461605 100644 (file)
--- a/asn1/snmp/packet-snmp-template.c
+++ b/asn1/snmp/packet-snmp-template.c
@@ -835,7 +835,7 @@ indexing_done:
                                goto already_added;
                        }
                        case BER_CLASS_UNI|(BER_UNI_TAG_OCTETSTRING<<4):
-                               if((oid_info->value_type->keytype == OID_KEY_TYPE_STRING)&& (oid_info->value_hfid> -1)){
+                               if((oid_info->value_hfid> -1)&& (oid_info->value_type->keytype == OID_KEY_TYPE_STRING)){
                                        hfid = oid_info->value_hfid;
                                }else{
                                        hfid = hf_snmp_octetstring_value;

diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c
index 843849f57d35803a3352b3a4c170c8094e7dbc32..d7546bbcd14a617845904adb35151792c9c9614e 100644 (file)
--- a/epan/dissectors/packet-snmp.c
+++ b/epan/dissectors/packet-snmp.c
@@ -937,7 +937,7 @@ indexing_done:
                                goto already_added;
                        }
                        case BER_CLASS_UNI|(BER_UNI_TAG_OCTETSTRING<<4):
-                               if((oid_info->value_type->keytype == OID_KEY_TYPE_STRING)&& (oid_info->value_hfid> -1)){
+                               if((oid_info->value_hfid> -1)&& (oid_info->value_type->keytype == OID_KEY_TYPE_STRING)){
                                        hfid = oid_info->value_hfid;
                                }else{
                                        hfid = hf_snmp_octetstring_value;