Merge pull request #70 from PositiveTechnologies/Taint

Fixed ConversionException initialization
PositiveTechnologies · Jul 24, 2017 · 6676eca · 6676eca
2 parents 7d5abb5 + 17e10e4
commit 6676eca
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 12 deletions.
diff --git a/Sources/PT.PM.Common/Exceptions/ConversionException.cs b/Sources/PT.PM.Common/Exceptions/ConversionException.cs
@@ -18,8 +18,8 @@ public ConversionException(SerializationInfo info, StreamingContext context)
         {
         }
 
-        public ConversionException(string fileName, Exception ex = null, string message = "")
-            : base(ex, message)
+        public ConversionException(string fileName, Exception ex = null, string message = "", bool isPattern = false)
+            : base(ex, message, isPattern)
         {
             FileName = fileName;
         }

diff --git a/Sources/PT.PM.Common/Exceptions/MatchingException.cs b/Sources/PT.PM.Common/Exceptions/MatchingException.cs
@@ -12,8 +12,8 @@ public MatchingException()
         {
         }
 
-        public MatchingException(string fileName, Exception ex = null, string message = "")
-            : base(ex, message)
+        public MatchingException(string fileName, Exception ex = null, string message = "", bool isPattern = false)
+            : base(ex, message, isPattern)
         {
             FileName = fileName;
         }

diff --git a/Sources/PT.PM.Common/Exceptions/PMException.cs b/Sources/PT.PM.Common/Exceptions/PMException.cs
@@ -16,9 +16,10 @@ public PMException()
         {
         }
 
-        public PMException(Exception innerException, string message = "")
+        public PMException(Exception innerException, string message = "", bool isPattern = false)
             : base(message, innerException)
         {
+            IsPattern = isPattern;
         }
 
         protected PMException(SerializationInfo info, StreamingContext context)

diff --git a/Sources/PT.PM.Common/Exceptions/ParsingException.cs b/Sources/PT.PM.Common/Exceptions/ParsingException.cs
@@ -19,8 +19,8 @@ public ParsingException(SerializationInfo info, StreamingContext context)
         {
         }
 
-        public ParsingException(string fileName, Exception ex = null, string message = "")
-            : base(ex, message)
+        public ParsingException(string fileName, Exception ex = null, string message = "", bool isPattern = false)
+            : base(ex, message, isPattern)
         {
             FileName = fileName;
         }

diff --git a/Sources/PT.PM.Common/Exceptions/ShouldNotBeVisitedException.cs b/Sources/PT.PM.Common/Exceptions/ShouldNotBeVisitedException.cs
@@ -4,7 +4,11 @@ public class ShouldNotBeVisitedException : PMException
     {
         public override PMExceptionType ExceptionType => PMExceptionType.ShouldNotBeVisited;
 
-        private readonly string _ruleName;
+        private readonly string _ruleName = "";
+
+        public ShouldNotBeVisitedException()
+        {
+        }
 
         public ShouldNotBeVisitedException(string ruleName)
         {

diff --git a/Sources/PT.PM.Patterns/PatternConverter.cs b/Sources/PT.PM.Patterns/PatternConverter.cs
@@ -59,7 +59,7 @@ public Pattern[] Convert(IEnumerable<PatternDto> patternsDto)
                 }
                 catch (Exception ex)
                 {
-                    Logger.LogError(new ConversionException($"Error while \"{patternDto.Key}\" pattern deserialising ({patternDto.Value}) ", ex));
+                    Logger.LogError(new ConversionException("", ex, $"Error while \"{patternDto.Key}\" pattern deserialising ({patternDto.Value}) ", true));
                 }
             }
             return result.ToArray();
@@ -78,7 +78,7 @@ public PatternDto[] ConvertBack(IEnumerable<Pattern> patterns)
                 }
                 catch (Exception ex)
                 {
-                    Logger.LogError(new ConversionException($"Error while \"{pattern.Key}\" pattern serialising", ex));
+                    Logger.LogError(new ConversionException("", ex, $"Error while \"{pattern.Key}\" pattern serialising", true));
                 }
             }
             return result.ToArray();

diff --git a/Sources/PT.PM.sln b/Sources/PT.PM.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26403.7
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PT.PM", "PT.PM\PT.PM.csproj", "{ECB44673-2FB0-49E1-811F-973E3FA4DD22}"
 EndProject