sharpetronics/geany
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix wrong parsing of CSS tags when the definition block starts on a new line (reported by Dominic Hopf, thanks).

Browse Source 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3644 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Enrico Tröger 2009-03-22 22:49:29 +00:00
parent 3c36f39cd5
commit 9318d1def6
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2009-03-22 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* tagmanager/css.c:
Fix wrong parsing of CSS tags when the definition block starts on
a new line (reported by Dominic Hopf, thanks).
2009-03-20 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> 2009-03-20 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
* plugins/htmlchars.c: * plugins/htmlchars.c:

17
tagmanager/css.c
View File

@ -73,23 +73,14 @@ static CssParserState parseCssDeclaration( const unsigned char **position, cssKi
while ( isCssDeclarationAllowedChar(cp) || while ( isCssDeclarationAllowedChar(cp) ||
*cp == '\0' ) /* track the end of line into the loop */ *cp == '\0' ) /* track the end of line into the loop */
{ {
if( (int) *cp == '\0' ) if( *cp == ',' )
{
cp = fileReadLine ();
if( cp == NULL ){
makeCssSimpleTag(name, kind, TRUE);
*position = cp;
return P_STATE_AT_END;
}
}
else if( *cp == ',' )
{ {
makeCssSimpleTag(name, kind, TRUE); makeCssSimpleTag(name, kind, TRUE);
*position = cp; *position = cp;
return P_STATE_NONE; return P_STATE_NONE;
} }
else if( *cp == '{' ) else if( *cp == '{' || *cp == '\0' )
{ { /* assume that line end is the same as a starting definition (i.e. the { is on the next line */
makeCssSimpleTag(name, kind, TRUE); makeCssSimpleTag(name, kind, TRUE);
*position = cp; *position = cp;
return P_STATE_IN_DEFINITION; return P_STATE_IN_DEFINITION;
@ -197,6 +188,8 @@ static CssParserState parseCssLine( const unsigned char *line, CssParserState st
case P_STATE_IN_PAGE: case P_STATE_IN_PAGE:
case P_STATE_IN_FONTFACE: case P_STATE_IN_FONTFACE:
case P_STATE_IN_DEFINITION: case P_STATE_IN_DEFINITION:
if( *line == '\0' )
line = fileReadLine ();
if( *line == '}' ) if( *line == '}' )
state = P_STATE_NONE; state = P_STATE_NONE;
else if( *line == '\'' ) else if( *line == '\'' )