From 3df0924d235ef799c9012a099d17d7e938737cf6 Mon Sep 17 00:00:00 2001
From: Florian Lugou <florian.lugou@telecom-paristech.fr>
Date: Thu, 31 Mar 2016 15:02:46 +0000
Subject: [PATCH] fixed null pointer exception in AVATAR2ProVerif
---
src/avatartranslator/toproverif/AVATAR2ProVerif.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/avatartranslator/toproverif/AVATAR2ProVerif.java b/src/avatartranslator/toproverif/AVATAR2ProVerif.java
index 551b228ff3..2b5a8065a5 100755
--- a/src/avatartranslator/toproverif/AVATAR2ProVerif.java
+++ b/src/avatartranslator/toproverif/AVATAR2ProVerif.java
@@ -1280,7 +1280,10 @@ public class AVATAR2ProVerif implements AvatarTranslator {
if (pragma instanceof AvatarPragmaAuthenticity) {
AvatarAttributeState attrA = ((AvatarPragmaAuthenticity) pragma).getAttrA ();
AvatarAttributeState attrB = ((AvatarPragmaAuthenticity) pragma).getAttrB ();
- if (attrA.getState ().getName ().equals (_asme.getName ())) {
+ if (attrA.getAttribute ().getBlock () == arg.block && attrA.getState ().getName ().equals (_asme.getName ())) {
+ TraceManager.addDev ("DEBUG: " + attrA.getAttribute ());
+ TraceManager.addDev ("DEBUG: " + attrA.getAttribute ().getBlock ());
+ TraceManager.addDev ("DEBUG: " + arg.attributeCmp.get (attrA.getAttribute()));
String sp = "authenticity__" + AVATAR2ProVerif.makeAttrName (attrA.getAttribute ().getBlock ().getName (), attrA.getAttribute ().getName (), _asme.getName ()) + " (" + AVATAR2ProVerif.makeAttrName (attrA.getAttribute ().getBlock ().getName (), attrA.getAttribute ().getName (), arg.attributeCmp.get (attrA.getAttribute ()).toString ()) + ")";
if (!authenticityEvents.contains (sp)) {
authenticityEvents.add (sp);
--
GitLab