70326 2011-10-18 06:43:29 -0700 XSLStyleSheet only needs to manage XSLImportRule children. 2011-10-18 07:34:13 -0700 1 1 1 Unclassified WebKit XML 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kling kling oldest_to_newest 486011 0 kling 2011-10-18 06:43:29 -0700 The only StyleBase subclass that ever goes into XSLStyleSheet::m_children is XSLImportRule, so let's be specific about that. 486025 1 111438 kling 2011-10-18 07:02:34 -0700 Created attachment 111438 Proposed patch 486037 2 111438 koivisto 2011-10-18 07:13:49 -0700 Comment on attachment 111438 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=111438&action=review glorious, r=me > Source/WebCore/xml/XSLStyleSheetLibxslt.cpp:297 > + return child->document(); > } > + } else { > + xmlDocPtr result = import->styleSheet()->locateStylesheetSubResource(parentDoc, uri); > + if (result) > + return result; > } I would use continue at the end of if() and remove the else. 486043 3 111438 webkit-ews 2011-10-18 07:23:52 -0700 Comment on attachment 111438 Proposed patch Attachment 111438 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/10120264 486048 4 kling 2011-10-18 07:34:13 -0700 Committed r97751: <http://trac.webkit.org/changeset/97751> 111438 2011-10-18 07:02:34 -0700 2011-10-18 07:23:52 -0700 Proposed patch bug-70326.diff text/plain 9471 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkOThkM2ExLi42NDUxZTY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzQg QEAKIDIwMTEtMTAtMTggIEFuZHJlYXMgS2xpbmcgIDxrbGluZ0B3ZWJraXQub3JnPgogCisgICAg ICAgIFhTTFN0eWxlU2hlZXQgb25seSBuZWVkcyB0byBtYW5hZ2UgWFNMSW1wb3J0UnVsZSBjaGls ZHJlbi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcw MzI2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBj c3MvU3R5bGVCYXNlLmg6CisgICAgICAgICogeG1sL1hTTEltcG9ydFJ1bGUuaDoKKyAgICAgICAg KiBjc3MvQ1NTUnVsZS5oOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUnVsZTo6aXNJbXBvcnRSdWxl KToKKworICAgICAgICAgICAgTW92ZSBTdHlsZUJhc2U6OmlzSW1wb3J0UnVsZSgpIGRvd24gdG8g Q1NTUnVsZS4gU2luY2UgWFNMSW1wb3J0UnVsZSBubyBsb25nZXIKKyAgICAgICAgICAgIGltcGxl bWVudHMgaXQsIGl0J3Mgbm93IHNwZWNpZmljIHRvIENTU0ltcG9ydFJ1bGUuCisKKyAgICAgICAg KiB4bWwvWFNMU3R5bGVTaGVldC5oOgorCisgICAgICAgICAgICBDaGFuZ2UgbV9jaGlsZHJlbiB0 byBiZSBhIHZlY3RvciBvZiBYU0xJbXBvcnRSdWxlcy4gQWxzbyByZW1vdmUgbGVuZ3RoKCksCisg ICAgICAgICAgICBpdGVtKCkgYW5kIGFwcGVuZCgpIHNpbmNlIHRoZXkgd2VyZSBvbmx5IHVzZWQg aW50ZXJuYWxseSB0byBtb2RpZnkgbV9jaGlsZHJlbi4KKworICAgICAgICAqIHhtbC9YU0xTdHls ZVNoZWV0TGlieHNsdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpYU0xTdHlsZVNoZWV0Ojp+WFNM U3R5bGVTaGVldCk6CisgICAgICAgIChXZWJDb3JlOjpYU0xTdHlsZVNoZWV0Ojppc0xvYWRpbmcp OgorICAgICAgICAoV2ViQ29yZTo6WFNMU3R5bGVTaGVldDo6Y2xlYXJEb2N1bWVudHMpOgorICAg ICAgICAoV2ViQ29yZTo6WFNMU3R5bGVTaGVldDo6bG9hZENoaWxkU2hlZXQpOgorICAgICAgICAo V2ViQ29yZTo6WFNMU3R5bGVTaGVldDo6bG9jYXRlU3R5bGVzaGVldFN1YlJlc291cmNlKToKKwor ICAgICAgICAgICAgUmVtb3ZlIG5vdy11bm5lY2Vzc2FyeSBpc0ltcG9ydFJ1bGUoKSBjaGVja3Mg YW5kIHRpZHkgdXAgdGhlIGNvZGUgYSBiaXQuCisKKzIwMTEtMTAtMTggIEFuZHJlYXMgS2xpbmcg IDxrbGluZ0B3ZWJraXQub3JnPgorCiAgICAgICAgIE1vdmUgQ1NTUnVsZSBzcGVjaWZpYyB2aXJ0 dWFscyBmcm9tIFN0eWxlQmFzZSBkb3duIGludG8gQ1NTUnVsZS4KICAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcwMjQwCiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2Nzcy9DU1NSdWxlLmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUnVsZS5oCmlu ZGV4IDQ5NzQ4NzkuLjAzOTM4NGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NS dWxlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1J1bGUuaApAQCAtNTcsNiArNTcsNyBA QCBwdWJsaWM6CiAgICAgdmlydHVhbCBib29sIGlzUGFnZVJ1bGUoKSBjb25zdCB7IHJldHVybiBm YWxzZTsgfQogICAgIHZpcnR1YWwgYm9vbCBpc1N0eWxlUnVsZSgpIGNvbnN0IHsgcmV0dXJuIGZh bHNlOyB9CiAgICAgdmlydHVhbCBib29sIGlzUmVnaW9uU3R5bGVSdWxlKCkgY29uc3QgeyByZXR1 cm4gZmFsc2U7IH0KKyAgICB2aXJ0dWFsIGJvb2wgaXNJbXBvcnRSdWxlKCkgY29uc3QgeyByZXR1 cm4gZmFsc2U7IH0KIAogICAgIENTU1N0eWxlU2hlZXQqIHBhcmVudFN0eWxlU2hlZXQoKSBjb25z dDsKICAgICBDU1NSdWxlKiBwYXJlbnRSdWxlKCkgY29uc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9jc3MvU3R5bGVCYXNlLmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVCYXNlLmgK aW5kZXggMTAxNmZmOS4uYjFlYmM5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL1N0 eWxlQmFzZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUJhc2UuaApAQCAtNDgsNyAr NDgsNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIEtVUkwgYmFzZVVSTCgpIGNvbnN0 OwogCiAgICAgICAgIHZpcnR1YWwgYm9vbCBpc1J1bGUoKSBjb25zdCB7IHJldHVybiBmYWxzZTsg fQotICAgICAgICB2aXJ0dWFsIGJvb2wgaXNJbXBvcnRSdWxlKCkgY29uc3QgeyByZXR1cm4gZmFs c2U7IH0KIAogICAgICAgICB2aXJ0dWFsIGJvb2wgaXNTdHlsZVNoZWV0KCkgY29uc3QgeyByZXR1 cm4gZmFsc2U7IH0KICAgICAgICAgdmlydHVhbCBib29sIGlzQ1NTU3R5bGVTaGVldCgpIGNvbnN0 IHsgcmV0dXJuIGZhbHNlOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS94bWwvWFNMSW1w b3J0UnVsZS5oIGIvU291cmNlL1dlYkNvcmUveG1sL1hTTEltcG9ydFJ1bGUuaAppbmRleCAwNTk4 NThmLi44ZDk0ZTRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS94bWwvWFNMSW1wb3J0UnVs ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3htbC9YU0xJbXBvcnRSdWxlLmgKQEAgLTU1LDggKzU1 LDYgQEAgcHVibGljOgogcHJpdmF0ZToKICAgICBYU0xJbXBvcnRSdWxlKFhTTFN0eWxlU2hlZXQq IHBhcmVudFNoZWV0LCBjb25zdCBTdHJpbmcmIGhyZWYpOwogCi0gICAgdmlydHVhbCBib29sIGlz SW1wb3J0UnVsZSgpIGNvbnN0IHsgcmV0dXJuIHRydWU7IH0KLQogICAgIHZpcnR1YWwgdm9pZCBz ZXRYU0xTdHlsZVNoZWV0KGNvbnN0IFN0cmluZyYgaHJlZiwgY29uc3QgS1VSTCYgYmFzZVVSTCwg Y29uc3QgU3RyaW5nJiBzaGVldCk7CiAgICAgCiAgICAgU3RyaW5nIG1fc3RySHJlZjsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3htbC9YU0xTdHlsZVNoZWV0LmggYi9Tb3VyY2UvV2ViQ29y ZS94bWwvWFNMU3R5bGVTaGVldC5oCmluZGV4IDJjZjRiMDQuLjU0ZjUyMzIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3htbC9YU0xTdHlsZVNoZWV0LmgKKysrIGIvU291cmNlL1dlYkNvcmUv eG1sL1hTTFN0eWxlU2hlZXQuaApAQCAtNTYsOSArNTYsNiBAQCBwdWJsaWM6CiAgICAgICAgIHJl dHVybiBhZG9wdFJlZihuZXcgWFNMU3R5bGVTaGVldChwYXJlbnROb2RlLCBmaW5hbFVSTC5zdHJp bmcoKSwgZmluYWxVUkwsIHRydWUpKTsKICAgICB9CiAKLSAgICB1bnNpZ25lZCBsZW5ndGgoKSBj b25zdCB7IHJldHVybiBtX2NoaWxkcmVuLnNpemUoKTsgfQotICAgIFN0eWxlQmFzZSogaXRlbSh1 bnNpZ25lZCBpbmRleCkgeyByZXR1cm4gaW5kZXggPCBsZW5ndGgoKSA/IG1fY2hpbGRyZW4uYXQo aW5kZXgpLmdldCgpIDogMDsgfQotCiAgICAgLy8gVGFraW5nIGFuIGFyYml0cmFyeSBub2RlIGlz IHVuc2FmZSwgYmVjYXVzZSBvd25lciBub2RlIHBvaW50ZXIgY2FuIGJlY29tZSBzdGFsZS4KICAg ICAvLyBYU0xUUHJvY2Vzc29yIGVuc3VyZXMgdGhhdCB0aGUgc3R5bGVzaGVldCBkb2Vzbid0IG91 dGxpdmUgaXRzIHBhcmVudCwgaW4gcGFydCBieSBub3QgZXhwb3NpbmcgaXQgdG8gSmF2YVNjcmlw dC4KICAgICBzdGF0aWMgUGFzc1JlZlB0cjxYU0xTdHlsZVNoZWV0PiBjcmVhdGVGb3JYU0xUUHJv Y2Vzc29yKE5vZGUqIHBhcmVudE5vZGUsIGNvbnN0IFN0cmluZyYgb3JpZ2luYWxVUkwsIGNvbnN0 IEtVUkwmIGZpbmFsVVJMKQpAQCAtMTAwLDE3ICs5NywxMiBAQCBwdWJsaWM6CiAgICAgYm9vbCBw cm9jZXNzZWQoKSBjb25zdCB7IHJldHVybiBtX3Byb2Nlc3NlZDsgfQogCiBwcml2YXRlOgotICAg IHZvaWQgYXBwZW5kKFBhc3NSZWZQdHI8U3R5bGVCYXNlPiBjaGlsZCkKLSAgICB7Ci0gICAgICAg IG1fY2hpbGRyZW4uYXBwZW5kKGNoaWxkKTsKLSAgICB9Ci0KICAgICBYU0xTdHlsZVNoZWV0KE5v ZGUqIHBhcmVudE5vZGUsIGNvbnN0IFN0cmluZyYgb3JpZ2luYWxVUkwsIGNvbnN0IEtVUkwmIGZp bmFsVVJMLCBib29sIGVtYmVkZGVkKTsKICNpZiAhVVNFKFFYTUxRVUVSWSkKICAgICBYU0xTdHls ZVNoZWV0KFhTTEltcG9ydFJ1bGUqIHBhcmVudEltcG9ydCwgY29uc3QgU3RyaW5nJiBvcmlnaW5h bFVSTCwgY29uc3QgS1VSTCYgZmluYWxVUkwpOwogI2VuZGlmCiAKLSAgICBWZWN0b3I8UmVmUHRy PFN0eWxlQmFzZT4gPiBtX2NoaWxkcmVuOworICAgIFZlY3RvcjxSZWZQdHI8WFNMSW1wb3J0UnVs ZT4gPiBtX2NoaWxkcmVuOwogCiAgICAgRG9jdW1lbnQqIG1fb3duZXJEb2N1bWVudDsKICAgICBi b29sIG1fZW1iZWRkZWQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS94bWwvWFNMU3R5bGVT aGVldExpYnhzbHQuY3BwIGIvU291cmNlL1dlYkNvcmUveG1sL1hTTFN0eWxlU2hlZXRMaWJ4c2x0 LmNwcAppbmRleCA1ZjFiNmI3Li4yNjUyMDQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS94 bWwvWFNMU3R5bGVTaGVldExpYnhzbHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3htbC9YU0xT dHlsZVNoZWV0TGlieHNsdC5jcHAKQEAgLTc5LDIyICs3OSwxNyBAQCBYU0xTdHlsZVNoZWV0Ojp+ WFNMU3R5bGVTaGVldCgpCiAgICAgaWYgKCFtX3N0eWxlc2hlZXREb2NUYWtlbikKICAgICAgICAg eG1sRnJlZURvYyhtX3N0eWxlc2hlZXREb2MpOwogCi0gICAgZm9yICh1bnNpZ25lZCBpID0gMDsg aSA8IGxlbmd0aCgpOyArK2kpIHsKLSAgICAgICAgQVNTRVJUKGl0ZW0oaSktPnBhcmVudCgpID09 IHRoaXMpOwotICAgICAgICBpdGVtKGkpLT5zZXRQYXJlbnQoMCk7CisgICAgZm9yICh1bnNpZ25l ZCBpID0gMDsgaSA8IG1fY2hpbGRyZW4uc2l6ZSgpOyArK2kpIHsKKyAgICAgICAgQVNTRVJUKG1f Y2hpbGRyZW4uYXQoaSktPnBhcmVudCgpID09IHRoaXMpOworICAgICAgICBtX2NoaWxkcmVuLmF0 KGkpLT5zZXRQYXJlbnQoMCk7CiAgICAgfQogfQogCiBib29sIFhTTFN0eWxlU2hlZXQ6OmlzTG9h ZGluZygpCiB7Ci0gICAgdW5zaWduZWQgbGVuID0gbGVuZ3RoKCk7Ci0gICAgZm9yICh1bnNpZ25l ZCBpID0gMDsgaSA8IGxlbjsgKytpKSB7Ci0gICAgICAgIFN0eWxlQmFzZSogcnVsZSA9IGl0ZW0o aSk7Ci0gICAgICAgIGlmIChydWxlLT5pc0ltcG9ydFJ1bGUoKSkgewotICAgICAgICAgICAgWFNM SW1wb3J0UnVsZSogaW1wb3J0ID0gc3RhdGljX2Nhc3Q8WFNMSW1wb3J0UnVsZSo+KHJ1bGUpOwot ICAgICAgICAgICAgaWYgKGltcG9ydC0+aXNMb2FkaW5nKCkpCi0gICAgICAgICAgICAgICAgcmV0 dXJuIHRydWU7Ci0gICAgICAgIH0KKyAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbV9jaGls ZHJlbi5zaXplKCk7ICsraSkgeworICAgICAgICBpZiAobV9jaGlsZHJlbi5hdChpKS0+aXNMb2Fk aW5nKCkpCisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAgICAgcmV0dXJuIGZhbHNl OwogfQpAQCAtMTE5LDE0ICsxMTQsMTAgQEAgeG1sRG9jUHRyIFhTTFN0eWxlU2hlZXQ6OmRvY3Vt ZW50KCkKIHZvaWQgWFNMU3R5bGVTaGVldDo6Y2xlYXJEb2N1bWVudHMoKQogewogICAgIG1fc3R5 bGVzaGVldERvYyA9IDA7Ci0gICAgdW5zaWduZWQgbGVuID0gbGVuZ3RoKCk7Ci0gICAgZm9yICh1 bnNpZ25lZCBpID0gMDsgaSA8IGxlbjsgKytpKSB7Ci0gICAgICAgIFN0eWxlQmFzZSogcnVsZSA9 IGl0ZW0oaSk7Ci0gICAgICAgIGlmIChydWxlLT5pc0ltcG9ydFJ1bGUoKSkgewotICAgICAgICAg ICAgWFNMSW1wb3J0UnVsZSogaW1wb3J0ID0gc3RhdGljX2Nhc3Q8WFNMSW1wb3J0UnVsZSo+KHJ1 bGUpOwotICAgICAgICAgICAgaWYgKGltcG9ydC0+c3R5bGVTaGVldCgpKQotICAgICAgICAgICAg ICAgIGltcG9ydC0+c3R5bGVTaGVldCgpLT5jbGVhckRvY3VtZW50cygpOwotICAgICAgICB9Cisg ICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG1fY2hpbGRyZW4uc2l6ZSgpOyArK2kpIHsKKyAg ICAgICAgWFNMSW1wb3J0UnVsZSogaW1wb3J0ID0gbV9jaGlsZHJlbi5hdChpKS5nZXQoKTsKKyAg ICAgICAgaWYgKGltcG9ydC0+c3R5bGVTaGVldCgpKQorICAgICAgICAgICAgaW1wb3J0LT5zdHls ZVNoZWV0KCktPmNsZWFyRG9jdW1lbnRzKCk7CiAgICAgfQogfQogCkBAIC0yMzksNyArMjMwLDcg QEAgdm9pZCBYU0xTdHlsZVNoZWV0Ojpsb2FkQ2hpbGRTaGVldHMoKQogdm9pZCBYU0xTdHlsZVNo ZWV0Ojpsb2FkQ2hpbGRTaGVldChjb25zdCBTdHJpbmcmIGhyZWYpCiB7CiAgICAgUmVmUHRyPFhT TEltcG9ydFJ1bGU+IGNoaWxkUnVsZSA9IFhTTEltcG9ydFJ1bGU6OmNyZWF0ZSh0aGlzLCBocmVm KTsKLSAgICBhcHBlbmQoY2hpbGRSdWxlKTsKKyAgICBtX2NoaWxkcmVuLmFwcGVuZChjaGlsZFJ1 bGUpOwogICAgIGNoaWxkUnVsZS0+bG9hZFNoZWV0KCk7CiB9CiAKQEAgLTI3NiwzNyArMjY3LDMz IEBAIERvY3VtZW50KiBYU0xTdHlsZVNoZWV0Ojpvd25lckRvY3VtZW50KCkKIHhtbERvY1B0ciBY U0xTdHlsZVNoZWV0Ojpsb2NhdGVTdHlsZXNoZWV0U3ViUmVzb3VyY2UoeG1sRG9jUHRyIHBhcmVu dERvYywgY29uc3QgeG1sQ2hhciogdXJpKQogewogICAgIGJvb2wgbWF0Y2hlZFBhcmVudCA9IChw YXJlbnREb2MgPT0gZG9jdW1lbnQoKSk7Ci0gICAgdW5zaWduZWQgbGVuID0gbGVuZ3RoKCk7Ci0g ICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGxlbjsgKytpKSB7Ci0gICAgICAgIFN0eWxlQmFz ZSogcnVsZSA9IGl0ZW0oaSk7Ci0gICAgICAgIGlmIChydWxlLT5pc0ltcG9ydFJ1bGUoKSkgewot ICAgICAgICAgICAgWFNMSW1wb3J0UnVsZSogaW1wb3J0ID0gc3RhdGljX2Nhc3Q8WFNMSW1wb3J0 UnVsZSo+KHJ1bGUpOwotICAgICAgICAgICAgWFNMU3R5bGVTaGVldCogY2hpbGQgPSBpbXBvcnQt PnN0eWxlU2hlZXQoKTsKLSAgICAgICAgICAgIGlmICghY2hpbGQpCi0gICAgICAgICAgICAgICAg Y29udGludWU7Ci0gICAgICAgICAgICBpZiAobWF0Y2hlZFBhcmVudCkgewotICAgICAgICAgICAg ICAgIGlmIChjaGlsZC0+cHJvY2Vzc2VkKCkpCi0gICAgICAgICAgICAgICAgICAgIGNvbnRpbnVl OyAvLyBsaWJ4c2x0IGhhcyBiZWVuIGdpdmVuIHRoaXMgc2hlZXQgYWxyZWFkeS4KLQotICAgICAg ICAgICAgICAgIC8vIENoZWNrIHRoZSBVUkkgb2YgdGhlIGNoaWxkIHN0eWxlc2hlZXQgYWdhaW5z dCB0aGUgZG9jIFVSSS4KLSAgICAgICAgICAgICAgICAvLyBJbiBvcmRlciB0byBlbnN1cmUgdGhh dCBsaWJ4bWwgY2Fub25pY2FsaXplZCBib3RoIFVSTHMsIHdlIGdldCB0aGUgb3JpZ2luYWwgaHJl ZgotICAgICAgICAgICAgICAgIC8vIHN0cmluZyBmcm9tIHRoZSBpbXBvcnQgcnVsZSBhbmQgY2Fu b25pY2FsaXplIGl0IHVzaW5nIGxpYnhtbCBiZWZvcmUgY29tcGFyaW5nIGl0Ci0gICAgICAgICAg ICAgICAgLy8gd2l0aCB0aGUgVVJJIGFyZ3VtZW50LgotICAgICAgICAgICAgICAgIENTdHJpbmcg aW1wb3J0SHJlZiA9IGltcG9ydC0+aHJlZigpLnV0ZjgoKTsKLSAgICAgICAgICAgICAgICB4bWxD aGFyKiBiYXNlID0geG1sTm9kZUdldEJhc2UocGFyZW50RG9jLCAoeG1sTm9kZVB0cilwYXJlbnRE b2MpOwotICAgICAgICAgICAgICAgIHhtbENoYXIqIGNoaWxkVVJJID0geG1sQnVpbGRVUkkoKGNv bnN0IHhtbENoYXIqKWltcG9ydEhyZWYuZGF0YSgpLCBiYXNlKTsKLSAgICAgICAgICAgICAgICBi b29sIGVxdWFsVVJJcyA9IHhtbFN0ckVxdWFsKHVyaSwgY2hpbGRVUkkpOwotICAgICAgICAgICAg ICAgIHhtbEZyZWUoYmFzZSk7Ci0gICAgICAgICAgICAgICAgeG1sRnJlZShjaGlsZFVSSSk7Ci0g ICAgICAgICAgICAgICAgaWYgKGVxdWFsVVJJcykgewotICAgICAgICAgICAgICAgICAgICBjaGls ZC0+bWFya0FzUHJvY2Vzc2VkKCk7Ci0gICAgICAgICAgICAgICAgICAgIHJldHVybiBjaGlsZC0+ ZG9jdW1lbnQoKTsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICB9IGVsc2UgewotICAg ICAgICAgICAgICAgIHhtbERvY1B0ciByZXN1bHQgPSBpbXBvcnQtPnN0eWxlU2hlZXQoKS0+bG9j YXRlU3R5bGVzaGVldFN1YlJlc291cmNlKHBhcmVudERvYywgdXJpKTsKLSAgICAgICAgICAgICAg ICBpZiAocmVzdWx0KQotICAgICAgICAgICAgICAgICAgICByZXR1cm4gcmVzdWx0OworICAgIGZv ciAodW5zaWduZWQgaSA9IDA7IGkgPCBtX2NoaWxkcmVuLnNpemUoKTsgKytpKSB7CisgICAgICAg IFhTTEltcG9ydFJ1bGUqIGltcG9ydCA9IG1fY2hpbGRyZW4uYXQoaSkuZ2V0KCk7CisgICAgICAg IFhTTFN0eWxlU2hlZXQqIGNoaWxkID0gaW1wb3J0LT5zdHlsZVNoZWV0KCk7CisgICAgICAgIGlm ICghY2hpbGQpCisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgaWYgKG1hdGNoZWRQYXJl bnQpIHsKKyAgICAgICAgICAgIGlmIChjaGlsZC0+cHJvY2Vzc2VkKCkpCisgICAgICAgICAgICAg ICAgY29udGludWU7IC8vIGxpYnhzbHQgaGFzIGJlZW4gZ2l2ZW4gdGhpcyBzaGVldCBhbHJlYWR5 LgorCisgICAgICAgICAgICAvLyBDaGVjayB0aGUgVVJJIG9mIHRoZSBjaGlsZCBzdHlsZXNoZWV0 IGFnYWluc3QgdGhlIGRvYyBVUkkuCisgICAgICAgICAgICAvLyBJbiBvcmRlciB0byBlbnN1cmUg dGhhdCBsaWJ4bWwgY2Fub25pY2FsaXplZCBib3RoIFVSTHMsIHdlIGdldCB0aGUgb3JpZ2luYWwg aHJlZgorICAgICAgICAgICAgLy8gc3RyaW5nIGZyb20gdGhlIGltcG9ydCBydWxlIGFuZCBjYW5v bmljYWxpemUgaXQgdXNpbmcgbGlieG1sIGJlZm9yZSBjb21wYXJpbmcgaXQKKyAgICAgICAgICAg IC8vIHdpdGggdGhlIFVSSSBhcmd1bWVudC4KKyAgICAgICAgICAgIENTdHJpbmcgaW1wb3J0SHJl ZiA9IGltcG9ydC0+aHJlZigpLnV0ZjgoKTsKKyAgICAgICAgICAgIHhtbENoYXIqIGJhc2UgPSB4 bWxOb2RlR2V0QmFzZShwYXJlbnREb2MsICh4bWxOb2RlUHRyKXBhcmVudERvYyk7CisgICAgICAg ICAgICB4bWxDaGFyKiBjaGlsZFVSSSA9IHhtbEJ1aWxkVVJJKChjb25zdCB4bWxDaGFyKilpbXBv cnRIcmVmLmRhdGEoKSwgYmFzZSk7CisgICAgICAgICAgICBib29sIGVxdWFsVVJJcyA9IHhtbFN0 ckVxdWFsKHVyaSwgY2hpbGRVUkkpOworICAgICAgICAgICAgeG1sRnJlZShiYXNlKTsKKyAgICAg ICAgICAgIHhtbEZyZWUoY2hpbGRVUkkpOworICAgICAgICAgICAgaWYgKGVxdWFsVVJJcykgewor ICAgICAgICAgICAgICAgIGNoaWxkLT5tYXJrQXNQcm9jZXNzZWQoKTsKKyAgICAgICAgICAgICAg ICByZXR1cm4gY2hpbGQtPmRvY3VtZW50KCk7CiAgICAgICAgICAgICB9CisgICAgICAgIH0gZWxz ZSB7CisgICAgICAgICAgICB4bWxEb2NQdHIgcmVzdWx0ID0gaW1wb3J0LT5zdHlsZVNoZWV0KCkt PmxvY2F0ZVN0eWxlc2hlZXRTdWJSZXNvdXJjZShwYXJlbnREb2MsIHVyaSk7CisgICAgICAgICAg ICBpZiAocmVzdWx0KQorICAgICAgICAgICAgICAgIHJldHVybiByZXN1bHQ7CiAgICAgICAgIH0K ICAgICB9CiAK