Changeset 3693 in CLRX for CLRadeonExtender/trunk/amdbin/ROCmBinaries.cpp

Timestamp:

Feb 1, 2018, 4:21:53 PM (2 years ago)

Author:

matszpk

Message:

CLRadeonExtender: ROCmMetadata: Do not accept block string inside array []. Fixed prevIndent in consume method call.

File:

• CLRadeonExtender/trunk/amdbin/ROCmBinaries.cpp (modified) (7 diffs)

CLRadeonExtender/trunk/amdbin/ROCmBinaries.cpp

@@ -312 +312 @@
 
 static std::string parseYAMLStringValue(const char*& ptr, const char* end, size_t& lineNo,
-                    cxuint prevIndent, bool singleValue = false)
+                    cxuint prevIndent, bool singleValue = false, bool blockAccept = true)
 {
     skipSpacesToLineEnd(ptr, end);
@@ -323 +323 @@
     else if (*ptr == '|' || *ptr == '>')
     {
+        if (!blockAccept)
+            throw ParseException(lineNo, "Illegal block string start");
         // multiline
         bool newLineFold = *ptr=='>';
@@ -415 +417 @@
 public:
     virtual void consume(const char*& ptr, const char* end, size_t& lineNo,
-                cxuint prevIndent, bool singleValue) = 0;
+                cxuint prevIndent, bool singleValue, bool blockAccept) = 0;
 };
 
@@ -432 +434 @@
         {
             // parse in line
-            elemConsumer->consume(ptr, end, lineNo, 0, false);
+            elemConsumer->consume(ptr, end, lineNo, 0, false, false);
             skipSpacesAndComments(ptr, end, lineNo);
             if (ptr!=end && *ptr==']')
@@ -468 +470 @@
         if (afterMinus == ptr)
             throw ParseException(lineNo, "No spaces after '-'");
-        elemConsumer->consume(ptr, end, lineNo, indent0+1 + ptr-afterMinus, true);
+        elemConsumer->consume(ptr, end, lineNo, indent0, true, true);
         
         size_t indent = skipSpacesAndComments(ptr, end, lineNo);
@@ -496 +498 @@
     
     virtual void consume(const char*& ptr, const char* end, size_t& lineNo,
-                cxuint prevIndent, bool singleValue)
+                cxuint prevIndent, bool singleValue, bool blockAccept)
     {
         if (elemsNum == requiredElemsNum)
@@ -522 +524 @@
     
     virtual void consume(const char*& ptr, const char* end, size_t& lineNo,
-                cxuint prevIndent, bool singleValue)
+                cxuint prevIndent, bool singleValue, bool blockAccept)
     {
         const size_t oldLineNo = lineNo;
-        std::string str = parseYAMLStringValue(ptr, end, lineNo, prevIndent, singleValue);
+        std::string str = parseYAMLStringValue(ptr, end, lineNo, prevIndent,
+                                singleValue, blockAccept);
         // parse printf string
         ROCmPrintfInfo printfInfo{};