From e67eb17f93d395d0e6306392bf7c31bcae795000 Mon Sep 17 00:00:00 2001
From: ageay <ageay>
Date: Thu, 4 Apr 2013 07:59:09 +0000
Subject: [PATCH] Protections on Fields against null pointers

---
 src/MEDCoupling/MEDCouplingNatureOfField.cxx | 20 ++++++++++++++++++--
 src/MEDCoupling/MEDCouplingNatureOfField.hxx |  1 +
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/MEDCoupling/MEDCouplingNatureOfField.cxx b/src/MEDCoupling/MEDCouplingNatureOfField.cxx
index da684878f..3c44332fb 100644
--- a/src/MEDCoupling/MEDCouplingNatureOfField.cxx
+++ b/src/MEDCoupling/MEDCouplingNatureOfField.cxx
@@ -21,6 +21,7 @@
 #include "MEDCouplingNatureOfField.hxx"
 
 #include <algorithm>
+#include <sstream>
 
 namespace ParaMEDMEM
 {
@@ -37,7 +38,11 @@ namespace ParaMEDMEM
   {
     const int *pos=std::find(POS_OF_NATUREOFFIELD,POS_OF_NATUREOFFIELD+NB_OF_POSSIBILITIES,(int)nat);
     if(pos==POS_OF_NATUREOFFIELD+NB_OF_POSSIBILITIES)
-      throw INTERP_KERNEL::Exception("MEDCouplingNatureOfField::getRepr : Unrecognized nature of field !");
+      {
+        std::ostringstream oss; oss << "MEDCouplingNatureOfField::getRepr : Unrecognized nature of field ! ";
+        oss << GetAllPossibilitiesStr() << " !";
+        throw INTERP_KERNEL::Exception(oss.str().c_str());
+      }
     std::size_t pos2=std::distance(POS_OF_NATUREOFFIELD,pos);
     return REPR_OF_NATUREOFFIELD[pos2];
   }
@@ -50,5 +55,16 @@ namespace ParaMEDMEM
     std::size_t pos2=std::distance(POS_OF_NATUREOFFIELD,pos);
     return std::string(REPR_OF_NATUREOFFIELD[pos2]);
   }
+
+  std::string MEDCouplingNatureOfField::GetAllPossibilitiesStr()
+  {
+    std::ostringstream oss; oss << "Possibilities are : ";
+    for(int i=0;i<NB_OF_POSSIBILITIES;i++)
+      {
+        oss << REPR_OF_NATUREOFFIELD[i] << "(value=" << POS_OF_NATUREOFFIELD[i] << ")";
+        if(i!=NB_OF_POSSIBILITIES-1)
+          oss << ", ";
+      }
+    return oss.str();
+  }
 }
- 
diff --git a/src/MEDCoupling/MEDCouplingNatureOfField.hxx b/src/MEDCoupling/MEDCouplingNatureOfField.hxx
index 0061b4952..bc9e0caf4 100644
--- a/src/MEDCoupling/MEDCouplingNatureOfField.hxx
+++ b/src/MEDCoupling/MEDCouplingNatureOfField.hxx
@@ -40,6 +40,7 @@ namespace ParaMEDMEM
   public:
     MEDCOUPLING_EXPORT static const char *GetRepr(NatureOfField nat) throw(INTERP_KERNEL::Exception);
     MEDCOUPLING_EXPORT static std::string GetReprNoThrow(NatureOfField nat);
+    MEDCOUPLING_EXPORT static std::string GetAllPossibilitiesStr();
   private:
     static const int NB_OF_POSSIBILITIES=5;
     static const char *REPR_OF_NATUREOFFIELD[NB_OF_POSSIBILITIES];
-- 
2.39.2