This commit is contained in:
+52
-16
@@ -646,7 +646,7 @@ static sxi32 XMLExtractNS(SyXMLParser *pParse, SyToken *pToken, SyXMLRawStrNS *p
|
||||
sPrefix.nByte = nOfft;
|
||||
sPrefix.nLine = pTag->nLine;
|
||||
pTag->zString += nOfft + 1;
|
||||
pTag->nByte -= nOfft;
|
||||
pTag->nByte -= nOfft + 1;
|
||||
if(pTag->nByte < 1) {
|
||||
if(pParse->xError) {
|
||||
rc = pParse->xError("Missing tag name", SXML_ERROR_SYNTAX, pToken, pParse->pUserData);
|
||||
@@ -709,6 +709,7 @@ static sxi32 ProcessXML(SyXMLParser *pParse, SySet *pTagStack, SySet *pWorker)
|
||||
SySet *pTokenSet = &pParse->sToken;
|
||||
SyXMLRawStrNS sEntry;
|
||||
SyXMLRawStr sNs;
|
||||
SyXMLRawStr sPrefix;
|
||||
SyToken *pToken;
|
||||
int bGotTag;
|
||||
sxi32 rc;
|
||||
@@ -725,8 +726,9 @@ static sxi32 ProcessXML(SyXMLParser *pParse, SySet *pTagStack, SySet *pWorker)
|
||||
while(SXRET_OK == (SySetGetNextEntry(&(*pTokenSet), (void **)&pToken))) {
|
||||
SyZero(&sEntry, sizeof(SyXMLRawStrNS));
|
||||
SyZero(&sNs, sizeof(SyXMLRawStr));
|
||||
SyZero(&sPrefix, sizeof(SyXMLRawStr));
|
||||
SySetInit(&sEntry.sNSset, pParse->pAllocator, sizeof(SyHashEntry *));
|
||||
sEntry.nLine = sNs.nLine = pToken->nLine;
|
||||
sEntry.nLine = sNs.nLine = sPrefix.nLine = pToken->nLine;
|
||||
switch(pToken->nType) {
|
||||
case SXML_TOK_DOCTYPE:
|
||||
if(SySetUsed(pTagStack) > 1 || bGotTag) {
|
||||
@@ -832,6 +834,16 @@ static sxi32 ProcessXML(SyXMLParser *pParse, SySet *pTagStack, SySet *pWorker)
|
||||
} else {
|
||||
/* Invoke the supplied callback if any */
|
||||
if(pParse->xEndTag) {
|
||||
sxu32 nOfft;
|
||||
/* Capture the QName prefix before XMLExtractNS()
|
||||
* strips it from sEntry.zString. */
|
||||
if(SyByteFind(sEntry.zString, sEntry.nByte, ':', &nOfft) == SXRET_OK && nOfft > 0) {
|
||||
sPrefix.zString = sEntry.zString;
|
||||
sPrefix.nByte = nOfft;
|
||||
} else {
|
||||
sPrefix.zString = "";
|
||||
sPrefix.nByte = 0;
|
||||
}
|
||||
rc = SXRET_OK;
|
||||
if(pParse->nFlags & SXML_ENABLE_NAMESPACE) {
|
||||
/* Extract namespace URI */
|
||||
@@ -841,7 +853,7 @@ static sxi32 ProcessXML(SyXMLParser *pParse, SySet *pTagStack, SySet *pWorker)
|
||||
}
|
||||
}
|
||||
if(rc == SXRET_OK) {
|
||||
rc = pParse->xEndTag((SyXMLRawStr *)&sEntry, &sNs, pParse->pUserData);
|
||||
rc = pParse->xEndTag((SyXMLRawStr *)&sEntry, &sNs, &sPrefix, pParse->pUserData);
|
||||
if(rc == SXERR_ABORT) {
|
||||
return SXERR_ABORT;
|
||||
}
|
||||
@@ -876,6 +888,17 @@ static sxi32 ProcessXML(SyXMLParser *pParse, SySet *pTagStack, SySet *pWorker)
|
||||
/* Extract the tag and it's supplied attribute */
|
||||
rc = XMLProcessStartTag(pParse, pToken, &sEntry, pWorker, pTagStack);
|
||||
if(rc == SXRET_OK) {
|
||||
/* Capture the QName prefix before XMLExtractNS() strips it from
|
||||
* sEntry.zString. The URI itself is forwarded verbatim (it may
|
||||
* legitimately contain the namespace separator). */
|
||||
sxu32 nOfft;
|
||||
if(SyByteFind(sEntry.zString, sEntry.nByte, ':', &nOfft) == SXRET_OK && nOfft > 0) {
|
||||
sPrefix.zString = sEntry.zString;
|
||||
sPrefix.nByte = nOfft;
|
||||
} else {
|
||||
sPrefix.zString = "";
|
||||
sPrefix.nByte = 0;
|
||||
}
|
||||
if(pParse->nFlags & SXML_ENABLE_NAMESPACE) {
|
||||
/* Extract namespace URI */
|
||||
rc = XMLExtractNS(pParse, pToken, &sEntry, &sNs);
|
||||
@@ -884,15 +907,17 @@ static sxi32 ProcessXML(SyXMLParser *pParse, SySet *pTagStack, SySet *pWorker)
|
||||
if(rc == SXRET_OK) {
|
||||
/* Invoke the supplied callback */
|
||||
if(pParse->xStartTag) {
|
||||
rc = pParse->xStartTag((SyXMLRawStr *)&sEntry, &sNs, SySetUsed(pWorker),
|
||||
(SyXMLRawStr *)SySetBasePtr(pWorker), pParse->pUserData);
|
||||
rc = pParse->xStartTag((SyXMLRawStr *)&sEntry, &sNs, &sPrefix, SySetUsed(pWorker),
|
||||
(SyXMLRawStr *)SySetBasePtr(pWorker),
|
||||
pToken->nType == SXML_TOK_START_END ? TRUE : FALSE,
|
||||
pParse->pUserData);
|
||||
if(rc == SXERR_ABORT) {
|
||||
return SXERR_ABORT;
|
||||
}
|
||||
}
|
||||
if(pToken->nType == SXML_TOK_START_END) {
|
||||
if(pParse->xEndTag) {
|
||||
rc = pParse->xEndTag((SyXMLRawStr *)&sEntry, &sNs, pParse->pUserData);
|
||||
rc = pParse->xEndTag((SyXMLRawStr *)&sEntry, &sNs, &sPrefix, pParse->pUserData);
|
||||
if(rc == SXERR_ABORT) {
|
||||
return SXERR_ABORT;
|
||||
}
|
||||
@@ -1000,20 +1025,31 @@ PH7_PRIVATE sxi32 SyXMLProcess(SyXMLParser *pParser, const char *zInput, sxu32 n
|
||||
/* Process XML Tokens */
|
||||
rc = ProcessXML(&(*pParser), &sTagStack, &sWorker);
|
||||
if(pParser->nFlags & SXML_ENABLE_NAMESPACE) {
|
||||
SyXMLRawStrNS *pTag;
|
||||
SyHashEntry *pNs;
|
||||
/* Tags still open after an abort own their declaration-list buffer.
|
||||
* XMLnsUnlink() already released the buffers of closed tags. */
|
||||
if(SySetUsed(&sTagStack) > 0) {
|
||||
SyXMLRawStrNS *pEntry;
|
||||
SyHashEntry **apEntry;
|
||||
sxu32 n;
|
||||
SySetResetCursor(&sTagStack);
|
||||
while(SySetGetNextEntry(&sTagStack, (void **)&pEntry) == SXRET_OK) {
|
||||
/* Release namespace entries */
|
||||
apEntry = (SyHashEntry **)SySetBasePtr(&pEntry->sNSset);
|
||||
for(n = 0 ; n < SySetUsed(&pEntry->sNSset) ; ++n) {
|
||||
SyMemBackendFree(pParser->pAllocator, apEntry[n]->pUserData);
|
||||
}
|
||||
SySetRelease(&pEntry->sNSset);
|
||||
while(SySetGetNextEntry(&sTagStack, (void **)&pTag) == SXRET_OK) {
|
||||
SySetRelease(&pTag->sNSset);
|
||||
}
|
||||
}
|
||||
/* Single ownership point for the namespace hash: every declaration
|
||||
* still present here was inserted by XMLProcessNamesSpace() and owns
|
||||
* a heap SyXMLRawStr. XMLnsUnlink() already removed closed ones, so
|
||||
* on the normal path this loop is a no-op. On an abort it removes
|
||||
* the remaining entries *and* frees their payload exactly once --
|
||||
* leaving stale keys/payloads would make a later Parse() on the same
|
||||
* reader read freed memory in XMLExtractNS(). SyHashGetNextEntry()
|
||||
* advances the cursor before returning, so deleting the entry here
|
||||
* is safe. */
|
||||
SyHashResetLoopCursor(&pParser->hns);
|
||||
while((pNs = SyHashGetNextEntry(&pParser->hns)) != 0) {
|
||||
void *pUserData = pNs->pUserData;
|
||||
SyHashDeleteEntry2(pNs);
|
||||
SyMemBackendFree(pParser->pAllocator, pUserData);
|
||||
}
|
||||
}
|
||||
}
|
||||
/* Clean-up the mess left behind */
|
||||
|
||||
Reference in New Issue
Block a user