크리티컬 변수 추출 보완

@@ -69,7 +69,7 @@ namespace VulnCrawler
 
 
             // var fields = VulnWorker.GetCriticalVariant(@"return _is_safe_url(url, host) and _is_safe_url(url.replace('\\', '/'), host)");
             // var fields = VulnWorker.GetCriticalVariant(@"return _is_safe_url(url, host) and _is_safe_url(url.replace('\\', '/'), host)");
             var c = new VulnC();
             var c = new VulnC();
-            var fields = c.GetCriticalVariant(@"cs64_chunk.chunkSize64 = 12345678;");
+            var fields = c.ExtractCriticalVariant(@"!DoReadFile (infile, &ds64_chunk, sizeof (DS64Chunk), &bcount) ||/* aaaa */");
             foreach (var item in fields)
             foreach (var item in fields)
             {
             {
                 Console.WriteLine(item);
                 Console.WriteLine(item);

@@ -168,24 +168,33 @@ namespace VulnCrawler
         /// </summary>
         /// </summary>
         /// <param name="line">현재 코드줄</param>
         /// <param name="line">현재 코드줄</param>
         /// <returns></returns>
         /// <returns></returns>
-        public IEnumerable<string> GetCriticalVariant(string line)
+        public IEnumerable<string> ExtractCriticalVariant(string line)
         {
         {
             line = line.Trim();
             line = line.Trim();
+            if (string.IsNullOrWhiteSpace(line))
+            {
+                yield break;
+            }
             if (line.StartsWith("//"))
             if (line.StartsWith("//"))
             {
             {
                 yield break;
                 yield break;
             }
             }
             string declarePattern = @"(?<Declare>[a-zA-Z0-9_\.]+) [a-zA-Z0-9_\.]+ =";
             string declarePattern = @"(?<Declare>[a-zA-Z0-9_\.]+) [a-zA-Z0-9_\.]+ =";
             // 메서드 정규식 패턴
             // 메서드 정규식 패턴
-            string methodPattern = @"(\w+)\s*\(";
+            string methodPattern = @"([a-zA-Z0-9_\.]+)\s*\(";
             // 변수 정규식 패턴
             // 변수 정규식 패턴
-            string fieldPattern = @"^*?[a-zA-Z0-9_\.]+";
+            string fieldPattern = @"^*?[a-zA-Z0-9_\.\[\]]+";
             
             
             string invalidPattern = @"^[\d\.]+";
             string invalidPattern = @"^[\d\.]+";
 
 
-            string commentPattern = @"("".*"")";
+            string commentPattern = @"[""].*[""]";
+
+            string commentPattern2 = @"\/\/.*";
+            string commentPattern3 = @"\/\*.+\*\/";
 
 
             line = Regex.Replace(line, commentPattern, "");
             line = Regex.Replace(line, commentPattern, "");
+            line = Regex.Replace(line, commentPattern2, "");
+            line = Regex.Replace(line, commentPattern3, "");
             // 메서드 목록
             // 메서드 목록
             var methodSets = new HashSet<string>();
             var methodSets = new HashSet<string>();
 
 
@@ -208,7 +217,7 @@ namespace VulnCrawler
                 if (method.Success)
                 if (method.Success)
                 {
                 {
                     Console.WriteLine(method.Groups[1].Value);
                     Console.WriteLine(method.Groups[1].Value);
-                    methodSets.Add(method.Groups[1].Value);
+                    methodSets.Add(method.Groups[1].Value); // aaaa
                 }
                 }
             }
             }
             Console.WriteLine("----");
             Console.WriteLine("----");