diff options
| -rw-r--r-- | gtk/PlatGTK.cxx | 2 | ||||
| -rw-r--r-- | src/LexBullant.cxx | 1 | ||||
| -rw-r--r-- | src/LexVHDL.cxx | 3 |
3 files changed, 3 insertions, 3 deletions
diff --git a/gtk/PlatGTK.cxx b/gtk/PlatGTK.cxx index 55947113e..b90b8c46e 100644 --- a/gtk/PlatGTK.cxx +++ b/gtk/PlatGTK.cxx @@ -347,7 +347,7 @@ static void GenerateFontSpecStrings(const char *fontName, int characterSet, d2 = strchr(d1 + 1, '-'); if (d2) d3 = strchr(d2 + 1, '-'); - if (d3) { + if (d3 && d2) { // foundary-fontface-isoxxx-x *d2 = '\0'; foundary[0] = '-'; diff --git a/src/LexBullant.cxx b/src/LexBullant.cxx index cc60cd2fc..d40e50bde 100644 --- a/src/LexBullant.cxx +++ b/src/LexBullant.cxx @@ -21,6 +21,7 @@ using namespace Scintilla; static int classifyWordBullant(unsigned int start, unsigned int end, WordList &keywords, Accessor &styler) { char s[100]; + s[0] = '\0'; for (unsigned int i = 0; i < end - start + 1 && i < 30; i++) { s[i] = static_cast<char>(tolower(styler[start + i])); s[i + 1] = '\0'; diff --git a/src/LexVHDL.cxx b/src/LexVHDL.cxx index c082cdb92..bd9a0a8ee 100644 --- a/src/LexVHDL.cxx +++ b/src/LexVHDL.cxx @@ -249,7 +249,6 @@ static void FoldNoBoxVHDLDoc( char chPrev = '\0'; char chNextNonBlank; int styleNext = styler.StyleAt(startPos); - int style = initStyle; //Platform::DebugPrintf("Line[%04d] Prev[%20s] ************************* Level[%x]\n", lineCurrent+1, prevWord, levelCurrent); /***************************************/ @@ -265,7 +264,7 @@ static void FoldNoBoxVHDLDoc( j ++ ; chNextNonBlank = styler.SafeGetCharAt(j); } - style = styleNext; + int style = styleNext; styleNext = styler.StyleAt(i + 1); bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n'); |