adium-1.4 3349:327927ad486c: Copy LMX from trunk (http://hg.adiu...

commits at adium.im commits at adium.im
Mon Feb 14 22:22:00 UTC 2011


details:	http://hg.adium.im/adium-1.4/rev/327927ad486c
revision:	3349:327927ad486c
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Mon Feb 14 23:21:53 2011 +0100

Copy LMX from trunk (http://hg.adium.im/adium/rev/1721a9e92faf should have been transplanted?)

This was the cause for some hangs when reading badly formatted logs on ICQ.

Fixes #14627

diffs (40 lines):

diff -r 2e9c32fda335 -r 327927ad486c Frameworks/LMX.framework/Versions/A/Headers/LMXParser.h
--- a/Frameworks/LMX.framework/Versions/A/Headers/LMXParser.h	Mon Feb 14 22:40:55 2011 +0100
+++ b/Frameworks/LMX.framework/Versions/A/Headers/LMXParser.h	Mon Feb 14 23:21:53 2011 +0100
@@ -40,21 +40,21 @@
 	NSString *attributeValue;
 	off_t charactersRunStartIndex, tokenRunStartIndex, entityNameRunStartIndex, commentRunStartIndex;
 	off_t greaterThanIndex;
-	unsigned reserved:       22;
-	unsigned inComment:       1;
+	unsigned reserved:22;
+	unsigned inComment:1;
 	//Start of a comment: <!--
 	//  End of a comment:   -->
-	unsigned hasBang:         1; //With has{First,Second}Hyphen, indicates a comment may be about to start (if a < is encountered)
-	unsigned hasSecondHyphen: 1; //With hasGreaterThan and hasFirstHyphen, part of the start of a comment
-	unsigned hasFirstHyphen:  1; //With hasGreaterThan, 1/3 of the end of a comment; else, 1/3 of the start of a comment
-	unsigned hasEqualSign:    1; //An attribute value has been recorded, and a = encountered
-	unsigned couldBeEndTag:   1; //A / has been encountered
-	unsigned isEmptyTag:      1; //A / was encountered immediately after a >
-	unsigned inEntity:        1; //In between & and ;
-	unsigned hasHashMark:     1; //A # was just encountered (if this is 1 when the & is encountered, it's a numeric entity; otherwise, the entity ends)
-	unsigned noNonWhitespaceSinceTagEnd: 1; //Used by / to check for a <blah/> tag
-	unsigned inTag:           1; //In between < and >
-	unsigned parsing:         1; //Set to 0 by -pause
+	unsigned hasBang:1; //With has{First,Second}Hyphen, indicates a comment may be about to start (if a < is encountered)
+	unsigned hasSecondHyphen:1; //With hasGreaterThan and hasFirstHyphen, part of the start of a comment
+	unsigned hasFirstHyphen:1; //With hasGreaterThan, 1/3 of the end of a comment; else, 1/3 of the start of a comment
+	unsigned hasEqualSign:1; //An attribute value has been recorded, and a = encountered
+	unsigned couldBeEndTag:1; //A / has been encountered
+	unsigned isEmptyTag:1; //A / was encountered immediately after a >
+	unsigned inEntity:1; //In between & and ;
+	unsigned hasHashMark:1; //A # was just encountered (if this is 1 when the & is encountered, it's a numeric entity; otherwise, the entity ends)
+	unsigned noNonWhitespaceSinceTagEnd:1; //Used by / to check for a <blah/> tag
+	unsigned inTag:1; //In between < and >
+	unsigned parsing:1; //Set to 0 by -pause
 	char attributeQuoteChar; //One of '"', '\'', or '\0'
 }
 
diff -r 2e9c32fda335 -r 327927ad486c Frameworks/LMX.framework/Versions/A/LMX
Binary file Frameworks/LMX.framework/Versions/A/LMX has changed




More information about the commits mailing list