Merge pull request #343 from Dmitry-Me/checkEntityWasPrinted

Ensure proper pattern was found and printed
2015-07-01 14:18:15 -07:00 · 2015-07-01 14:18:15 -07:00 · 4824e95bc0
parent 70fd52a574 39c399a0f2
commit 4824e95bc0
1 changed files with 6 additions and 0 deletions
--- a/tinyxml2.cpp
+++ b/tinyxml2.cpp
@ -2146,12 +2146,18 @@ void XMLPrinter::PrintString( const char* p, bool restricted )
                        Print( "%.*s", toPrint, p );
                        p += toPrint;
                    }
+                    bool entityPatternPrinted = false;
                    for( int i=0; i<NUM_ENTITIES; ++i ) {
                        if ( entities[i].value == *q ) {
                            Print( "&%s;", entities[i].pattern );
+                            entityPatternPrinted = true;
                            break;
                        }
                    }
+                    if ( !entityPatternPrinted ) {
+                        // TIXMLASSERT( entityPatternPrinted ) causes gcc -Wunused-but-set-variable in release
+                        TIXMLASSERT( false );
+                    }
                    ++p;
                }
            }