42602 2010-07-19 15:56:54 -0700 Implement NPN_PostURLNotify 2010-07-19 17:08:07 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca webkit.review.bot oldest_to_newest 253438 0 andersca 2010-07-19 15:56:54 -0700 Implement NPN_PostURLNotify 253444 1 62008 andersca 2010-07-19 16:15:18 -0700 Created attachment 62008 Patch 253447 2 webkit.review.bot 2010-07-19 16:21:01 -0700 Attachment 62008 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:359: NPN_PostURLNotify is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h:35: Code inside a namespace should not be indented. [whitespace/indent] [4] WebKit2/WebProcess/Plugins/PluginController.h:32: Code inside a namespace should not be indented. [whitespace/indent] [4] Total errors found: 3 in 9 files If any of these errors are false positives, please file a bug against check-webkit-style. 253451 3 62008 sam 2010-07-19 16:23:17 -0700 Comment on attachment 62008 Patch I am not sure all the inline's are necessary. 253483 4 andersca 2010-07-19 17:08:07 -0700 Committed r63701: <http://trac.webkit.org/changeset/63701> 62008 2010-07-19 16:15:18 -0700 2010-07-19 16:23:17 -0700 Patch bug-42602-20100719161517.patch text/plain 20788 andersca ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MDk2MTY2ZjE0NmZmZjFmMjcwODI1MTBkMTljOWU1ZjA0ZGIwZDY5YS4uMzdlZjQ2ZDNhZDM5YTk1 OTUyMmIzODIwNDk1MmYyYzE1ZDgwMjA0YiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxMC0wNy0xOSAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcGxlbWVudCBOUE5fUG9zdFVSTE5vdGlmeQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDI2MDIKKwor ICAgICAgICBFeHBvcnQgc3ltYm9scyBuZWVkZWQgYnkgV2ViS2l0Mi4KKworICAgICAgICAqIFdl YkNvcmUuZXhwLmluOgorCiAyMDEwLTA3LTE4ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBh cHBsZS5jb20+CiAKICAgICAgICAgRml4IEJ1aWxkLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9XZWJD b3JlLmV4cC5pbiBiL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KaW5kZXggNDVhZDgzYzJlNmQ5Mjc2 NzkzZmI0MjZlMzMyZWUxODg0OWFmMThlMi4uNTQ2MDIxZjA4OTI0ZGZiM2Y1Y2QxMmRmOGQ3Mzk1 MTE0NDJjMGI4OCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgorKysgYi9XZWJD b3JlL1dlYkNvcmUuZXhwLmluCkBAIC0yNjMsNiArMjYzLDcgQEAgX19aTjdXZWJDb3JlMTJSZW5k ZXJXaWRnZXQxOXNob3dTdWJzdGl0dXRlSW1hZ2VFTjNXVEYxMFBhc3NSZWZQdHJJTlNfNUltYWdl RUVFCiBfX1pON1dlYkNvcmUxMlNjaGVkdWxlUGFpckMxRVA5TlNSdW5Mb29wUEsxMF9fQ0ZTdHJp bmcKIF9fWk43V2ViQ29yZTEyU2hhcmVkQnVmZmVyMTB3cmFwTlNEYXRhRVA2TlNEYXRhCiBfX1pO N1dlYkNvcmUxMlNoYXJlZEJ1ZmZlcjEyY3JlYXRlTlNEYXRhRXYKK19fWk43V2ViQ29yZTEyU2hh cmVkQnVmZmVyMjRjcmVhdGVXaXRoQ29udGVudHNPZkZpbGVFUktOU182U3RyaW5nRQogX19aTjdX ZWJDb3JlMTJTaGFyZWRCdWZmZXJEMUV2CiBfX1pON1dlYkNvcmUxMlRleHRFbmNvZGluZ0MxRVJL TlNfNlN0cmluZ0UKIF9fWk43V2ViQ29yZTEyVGV4dEl0ZXJhdG9yMTFyYW5nZUxlbmd0aEVQS05T XzVSYW5nZUViCkBAIC00MDksNyArNDEwLDkgQEAgX19aTjdXZWJDb3JlMTlBbmltYXRpb25Db250 cm9sbGVyMjFwYXVzZVRyYW5zaXRpb25BdFRpbWVFUE5TXzEyUmVuZGVyT2JqZWN0RVJLTlMKIF9f Wk43V2ViQ29yZTE5QmFja0ZvcndhcmRMaXN0SW1wbEMxRVBOU180UGFnZUUKIF9fWk43V2ViQ29y ZTE5Q1NTU3R5bGVEZWNsYXJhdGlvbjExc2V0UHJvcGVydHlFUktOU182U3RyaW5nRVMzX1JpCiBf X1pON1dlYkNvcmUxOUluc3BlY3RvckNvbnRyb2xsZXIzNGluc3BlY3RvclN0YXJ0c0F0dGFjaGVk U2V0dGluZ05hbWVFdgorX19aTjdXZWJDb3JlMTlSZXNvdXJjZVJlcXVlc3RCYXNlMTFzZXRIVFRQ Qm9keUVOM1dURjEwUGFzc1JlZlB0cklOU184Rm9ybURhdGFFRUUKIF9fWk43V2ViQ29yZTE5UmVz b3VyY2VSZXF1ZXN0QmFzZTEzc2V0SFRUUE1ldGhvZEVSS05TXzZTdHJpbmdFCitfX1pON1dlYkNv cmUxOVJlc291cmNlUmVxdWVzdEJhc2UxOWFkZEhUVFBIZWFkZXJGaWVsZHNFUktOU18xM0hUVFBI ZWFkZXJNYXBFCiBfX1pON1dlYkNvcmUxOVJlc291cmNlUmVxdWVzdEJhc2U2c2V0VVJMRVJLTlNf NEtVUkxFCiBfX1pON1dlYkNvcmUxOVNlbGVjdGlvbkNvbnRyb2xsZXIxMHNldEZvY3VzZWRFYgog X19aTjdXZWJDb3JlMTlTZWxlY3Rpb25Db250cm9sbGVyMTJzZXRTZWxlY3Rpb25FUktOU18xNlZp c2libGVTZWxlY3Rpb25FYmJiTlMwXzE5Q3Vyc29yQWxpZ25PblNjcm9sbEVOU18xNVRleHRHcmFu dWxhcml0eUVOU18yMERpcmVjdGlvbmFsaXR5UG9saWN5RQpAQCAtNjI4LDYgKzYzMSw3IEBAIF9f Wk43V2ViQ29yZThEb2N1bWVudDI2cGFnZVNpemVBbmRNYXJnaW5zSW5QaXhlbHNFaVJOU183SW50 U2l6ZUVSaVMzX1MzX1MzXwogX19aTjdXZWJDb3JlOERvY3VtZW50MjdyZW1vdmVNZWRpYUNhblN0 YXJ0TGlzdGVuZXJFUE5TXzIxTWVkaWFDYW5TdGFydExpc3RlbmVyRQogX19aTjdXZWJDb3JlOERv Y3VtZW50MzZ1cGRhdGVMYXlvdXRJZ25vcmVQZW5kaW5nU3R5bGVzaGVldHNFdgogX19aTjdXZWJD b3JlOERvY3VtZW50NGhlYWRFdgorX19aTjdXZWJDb3JlOEZvcm1EYXRhNmNyZWF0ZUVQS3ZtCiBf X1pON1dlYkNvcmU4Rm9ybURhdGFEMUV2CiBfX1pON1dlYkNvcmU4SW50UG9pbnRDMUVSSzhfTlNQ b2ludAogX19aTjdXZWJDb3JlOFBvc2l0aW9uQzFFTjNXVEYxMFBhc3NSZWZQdHJJTlNfNE5vZGVF RUVpCkBAIC04MzcsNiArODQxLDcgQEAgX19aTks3V2ViQ29yZTEyVGV4dEl0ZXJhdG9yNG5vZGVF dgogX19aTks3V2ViQ29yZTEyVGV4dEl0ZXJhdG9yNXJhbmdlRXYKIF9fWk5LN1dlYkNvcmUxM0Nv bnRhaW5lck5vZGUxNGNoaWxkTm9kZUNvdW50RXYKIF9fWk5LN1dlYkNvcmUxM0NvbnRhaW5lck5v ZGU5Y2hpbGROb2RlRWoKK19fWk5LN1dlYkNvcmUxM0hUVFBIZWFkZXJNYXAzZ2V0RVBLYwogX19a Tks3V2ViQ29yZTEzSGl0VGVzdFJlc3VsdDEwaXNMaXZlTGlua0V2CiBfX1pOSzdXZWJDb3JlMTNI aXRUZXN0UmVzdWx0MTBpc1NlbGVjdGVkRXYKIF9fWk5LN1dlYkNvcmUxM0hpdFRlc3RSZXN1bHQx MXRhcmdldEZyYW1lRXYKZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9D aGFuZ2VMb2cKaW5kZXggOTRmYjM1YzMzMzc2ZWM0ZjQ4NDZhZjllNDA1MzgxMDY5YzEwZjAxNy4u MmFmYjAxY2U3ZmMwZDRhYjAzYzkzODRhMGVhNjI0MmYwMjAzNGU4YSAxMDA2NDQKLS0tIGEvV2Vi S2l0Mi9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzOCBAQAor MjAxMC0wNy0xOSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcGxlbWVudCBOUE5f UG9zdFVSTE5vdGlmeQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NDI2MDIKKworICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRz Y2FwZUJyb3dzZXJGdW5jcy5jcHA6CisgICAgICAgIChXZWJLaXQ6OnBhcnNlUG9zdEJ1ZmZlcik6 CisgICAgICAgIFJlYWQgdGhlIGJ1ZmZlciBmcm9tIGEgZmlsZSBpZiBuZWNlc3NhcnkgYW5kIHBh cnNlIGl0LgorCisgICAgICAgIChXZWJLaXQ6Ok5QTl9HZXRVUkxOb3RpZnkpOgorICAgICAgICBB ZGQgZXh0cmEgYXJndW1lbnRzLgorCisgICAgICAgIChXZWJLaXQ6Ok5QTl9Qb3N0VVJMTm90aWZ5 KToKKyAgICAgICAgUGFyc2UgdGhlIHBvc3QgYnVmZmVyLCB0aGVuIGNhbGwgTmV0c2NhcGVQbHVn aW46OmxvYWRVUkwuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0 c2NhcGVQbHVnaW4uY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpbjo6bG9hZFVS TCk6CisgICAgICAgIFBhc3MgdGhlIG1ldGhvZCwgdGhlIGhlYWRlciBmaWVsZHMgYW5kIGZvcm0g ZGF0YSBhbG9uZy4KKworICAgICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpbjo6YWxsb3dQb3B1 cHMpOgorICAgICAgICBKdXN0IHJldHVybiBmYWxzZSBmb3Igbm93LgorCisgICAgICAgIChXZWJL aXQ6Ok5ldHNjYXBlUGx1Z2luOjppbml0aWFsaXplKToKKyAgICAgICAgUGFzcyBleHRyYSBhcmd1 bWVudHMgdG8gbG9hZFVSTC4KKworICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2Fw ZS9OZXRzY2FwZVBsdWdpbi5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5D b250cm9sbGVyLmg6CisgICAgICAgIEFkZCBtZXRob2QsIGhlYWRlciBmaWVsZHMgYW5kIGZvcm0g ZGF0YS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcDoKKyAg ICAgICAgKFdlYktpdDo6UGx1Z2luVmlldzo6bG9hZFVSTCk6CisgICAgICAgIFNldCB0aGUgbWV0 aG9kLCBhZGQgdGhlIGhlYWRlciBmaWVsZHMgYW5kIHNldCB0aGUgYm9keS4KKwogMjAxMC0wNy0x OCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIEFub3Ro ZXIgYXR0ZW1wdCBhdCBmaXhpbmcgdGhlIFdpbmRvd3MgYnVpbGQuCmRpZmYgLS1naXQgYS9XZWJL aXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZUJyb3dzZXJGdW5jcy5jcHAg Yi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZUJyb3dzZXJGdW5j cy5jcHAKaW5kZXggMGFmOWI1N2IyNmZmMjc1NDZiMmY2NGQ5MDRkYzY2MjE4Njk3M2U3Yy4uNjFk NTE0MzlmNWFiMDY0NjBjNTk2NzExYWIzOTcwYzdjYTQ5NGMyYiAxMDA2NDQKLS0tIGEvV2ViS2l0 Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVCcm93c2VyRnVuY3MuY3BwCisr KyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlQnJvd3NlckZ1 bmNzLmNwcApAQCAtMjgsMTIgKzI4LDIyNSBAQAogI2luY2x1ZGUgIk5QUnVudGltZVV0aWxpdGll cy5oIgogI2luY2x1ZGUgIk5ldHNjYXBlUGx1Z2luLmgiCiAjaW5jbHVkZSAiTm90SW1wbGVtZW50 ZWQuaCIKKyNpbmNsdWRlIDxXZWJDb3JlL0hUVFBIZWFkZXJNYXAuaD4KICNpbmNsdWRlIDxXZWJD b3JlL0lkZW50aWZpZXJSZXAuaD4KKyNpbmNsdWRlIDxXZWJDb3JlL1NoYXJlZEJ1ZmZlci5oPgor I2luY2x1ZGUgPHV0aWxpdHk+CiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwordXNpbmcgbmFt ZXNwYWNlIHN0ZDsKIAogbmFtZXNwYWNlIFdlYktpdCB7CisKK3N0YXRpYyBpbmxpbmUgYm9vbCBz dGFydHNXaXRoQmxhbmtMaW5lKGNvbnN0IGNoYXIqIGJ5dGVzLCB1bnNpZ25lZCBsZW5ndGgpCit7 CisgICAgcmV0dXJuIGxlbmd0aCA+IDAgJiYgYnl0ZXNbMF0gPT0gJ1xuJzsKK30KKworc3RhdGlj IGlubGluZSBpbnQgbG9jYXRpb25BZnRlckZpcnN0QmxhbmtMaW5lKGNvbnN0IGNoYXIqIGJ5dGVz LCB1bnNpZ25lZCBsZW5ndGgpCit7CisgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGxlbmd0 aCAtIDQ7IGkrKykgeworICAgICAgICAvLyBTdXBwb3J0IGZvciBBY3JvYmF0LiBJdCBzZW5kcyAi XG5cbiIuCisgICAgICAgIGlmIChieXRlc1tpXSA9PSAnXG4nICYmIGJ5dGVzW2kgKyAxXSA9PSAn XG4nKQorICAgICAgICAgICAgcmV0dXJuIGkgKyAyOworICAgICAgICAKKyAgICAgICAgLy8gUmV0 dXJucyB0aGUgcG9zaXRpb24gYWZ0ZXIgMiBDUkxGJ3Mgb3IgMSBDUkxGIGlmIGl0IGlzIHRoZSBm aXJzdCBsaW5lLgorICAgICAgICBpZiAoYnl0ZXNbaV0gPT0gJ1xyJyAmJiBieXRlc1tpICsgMV0g PT0gJ1xuJykgeworICAgICAgICAgICAgaSArPSAyOworICAgICAgICAgICAgaWYgKGkgPT0gMikK KyAgICAgICAgICAgICAgICByZXR1cm4gaTsKKworICAgICAgICAgICAgaWYgKGJ5dGVzW2ldID09 ICdcbicpIHsKKyAgICAgICAgICAgICAgICAvLyBTdXBwb3J0IGZvciBEaXJlY3Rvci4gSXQgc2Vu ZHMgIlxyXG5cbiIgKDM4ODAzODcpLgorICAgICAgICAgICAgICAgIHJldHVybiBpICsgMTsKKyAg ICAgICAgICAgIH0KKworICAgICAgICAgICAgaWYgKGJ5dGVzW2ldID09ICdccicgJiYgYnl0ZXNb aSArIDFdID09ICdcbicpIHsKKyAgICAgICAgICAgICAgICAvLyBTdXBwb3J0IGZvciBGbGFzaC4g SXQgc2VuZHMgIlxyXG5cclxuIiAoMzc1ODExMykuCisgICAgICAgICAgICAgICAgcmV0dXJuIGkg KyAyOworICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgfQorCisgICAgcmV0dXJuIC0xOwor fQorCitzdGF0aWMgaW5saW5lIGNvbnN0IGNoYXIqIGZpbmRFbmRPZkxpbmUoY29uc3QgY2hhciog Ynl0ZXMsIHVuc2lnbmVkIGxlbmd0aCkKK3sKKyAgICAvLyBBY2NvcmRpbmcgdG8gdGhlIEhUVFAg c3BlY2lmaWNhdGlvbiBFT0wgaXMgZGVmaW5lZCBhcworICAgIC8vIGEgQ1JMRiBwYWlyLiBVbmZv cnR1bmF0ZWx5LCBzb21lIHNlcnZlcnMgd2lsbCB1c2UgTEYKKyAgICAvLyBpbnN0ZWFkLiBXb3Jz ZSB5ZXQsIHNvbWUgc2VydmVycyB3aWxsIHVzZSBhIGNvbWJpbmF0aW9uCisgICAgLy8gb2YgYm90 aCAoZS5nLiA8aGVhZGVyPkNSTEZMRjxib2R5PiksIHNvIGZpbmRFT0wgbmVlZHMKKyAgICAvLyB0 byBiZSBtb3JlIGZvcmdpdmluZy4gSXQgd2lsbCBub3cgYWNjZXB0IENSTEYsIExGIG9yCisgICAg Ly8gQ1IuCisgICAgLy8KKyAgICAvLyBJdCByZXR1cm5zIDAgaWYgRU9MRiBpcyBub3QgZm91bmQg b3IgaXQgd2lsbCByZXR1cm4KKyAgICAvLyBhIHBvaW50ZXIgdG8gdGhlIGZpcnN0IHRlcm1pbmF0 aW5nIGNoYXJhY3Rlci4KKyAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbGVuZ3RoOyBpKysp IHsKKyAgICAgICAgaWYgKGJ5dGVzW2ldID09ICdcbicpCisgICAgICAgICAgICByZXR1cm4gYnl0 ZXMgKyBpOworICAgICAgICBpZiAoYnl0ZXNbaV0gPT0gJ1xyJykgeworICAgICAgICAgICAgLy8g Q2hlY2sgdG8gc2VlIGlmIHNwYW5uaW5nIGJ1ZmZlciBib3VuZHMKKyAgICAgICAgICAgIC8vIChD UkxGIGlzIGFjcm9zcyByZWFkcykuIElmIHNvLCB3YWl0IGZvcgorICAgICAgICAgICAgLy8gbmV4 dCByZWFkLgorICAgICAgICAgICAgaWYgKGkgKyAxID09IGxlbmd0aCkKKyAgICAgICAgICAgICAg ICBicmVhazsKKworICAgICAgICAgICAgcmV0dXJuIGJ5dGVzICsgaTsKKyAgICAgICAgfQorICAg IH0KKworICAgIHJldHVybiAwOworfQorCitzdGF0aWMgaW5saW5lIFN0cmluZyBjYXBpdGFsaXpl UkZDODIySGVhZGVyRmllbGROYW1lKGNvbnN0IFN0cmluZyYgbmFtZSkKK3sKKyAgICBib29sIGNh cGl0YWxpemVDaGFyYWN0ZXIgPSB0cnVlOworICAgIFN0cmluZyByZXN1bHQ7CisKKyAgICBmb3Ig KHVuc2lnbmVkIGkgPSAwOyBpIDwgbmFtZS5sZW5ndGgoKTsgaSsrKSB7CisgICAgICAgIFVDaGFy IGM7CisKKyAgICAgICAgaWYgKGNhcGl0YWxpemVDaGFyYWN0ZXIgJiYgbmFtZVtpXSA+PSAnYScg JiYgbmFtZVtpXSA8PSAneicpCisgICAgICAgICAgICBjID0gdG9BU0NJSVVwcGVyKG5hbWVbaV0p OworICAgICAgICBlbHNlIGlmICghY2FwaXRhbGl6ZUNoYXJhY3RlciAmJiBuYW1lW2ldID49ICdB JyAmJiBuYW1lW2ldIDw9ICdaJykKKyAgICAgICAgICAgIGMgPSB0b0FTQ0lJTG93ZXIobmFtZVtp XSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIGMgPSBuYW1lW2ldOworCisgICAgICAgIGlm IChuYW1lW2ldID09ICctJykKKyAgICAgICAgICAgIGNhcGl0YWxpemVDaGFyYWN0ZXIgPSB0cnVl OworICAgICAgICBlbHNlCisgICAgICAgICAgICBjYXBpdGFsaXplQ2hhcmFjdGVyID0gZmFsc2U7 CisKKyAgICAgICAgcmVzdWx0LmFwcGVuZChjKTsKKyAgICB9CisKKyAgICByZXR1cm4gcmVzdWx0 OworfQorCitzdGF0aWMgaW5saW5lIEhUVFBIZWFkZXJNYXAgcGFyc2VSRkM4MjJIZWFkZXJGaWVs ZHMoY29uc3QgY2hhciogYnl0ZXMsIHVuc2lnbmVkIGxlbmd0aCkKK3sKKyAgICBTdHJpbmcgbGFz dEhlYWRlcktleTsKKyAgICBIVFRQSGVhZGVyTWFwIGhlYWRlckZpZWxkczsKKworICAgIC8vIExv b3Agb3ZlciBsaW5lcyB1bnRpbCB3ZSdyZSBwYXN0IHRoZSBoZWFkZXIsIG9yIHdlIGNhbid0IGZp bmQgYW55IG1vcmUgZW5kLW9mLWxpbmVzCisgICAgd2hpbGUgKGNvbnN0IGNoYXIqIGVuZE9mTGlu ZSA9IGZpbmRFbmRPZkxpbmUoYnl0ZXMsIGxlbmd0aCkpIHsKKyAgICAgICAgY29uc3QgY2hhciog bGluZSA9IGJ5dGVzOworICAgICAgICBpbnQgbGluZUxlbmd0aCA9IGVuZE9mTGluZSAtIGJ5dGVz OworCisgICAgICAgIC8vIE1vdmUgYnl0ZXMgdG8gdGhlIGNoYXJhY3RlciBhZnRlciB0aGUgdGVy bWluYXRvciBhcyByZXR1cm5lZCBieSBmaW5kRW5kT2ZMaW5lLgorICAgICAgICBieXRlcyA9IGVu ZE9mTGluZSArIDE7CisgICAgICAgIGlmICgoKmVuZE9mTGluZSA9PSAnXHInKSAmJiAoKmJ5dGVz ID09ICdcbicpKQorICAgICAgICAgICAgYnl0ZXMrKzsgLy8gU2FmZSBzaW5jZSBmaW5kRW5kT2ZM aW5lIHdvbid0IHJldHVybiBhIHNwYW5uaW5nIENSTEYuCisKKyAgICAgICAgbGVuZ3RoIC09IChi eXRlcyAtIGxpbmUpOworICAgICAgICBpZiAoIWxpbmVMZW5ndGgpIHsKKyAgICAgICAgICAgIC8v IEJsYW5rIGxpbmU7IHdlJ3JlIGF0IHRoZSBlbmQgb2YgdGhlIGhlYWRlcgorICAgICAgICAgICAg YnJlYWs7CisgICAgICAgIH0KKworICAgICAgICBpZiAoKmxpbmUgPT0gJyAnIHx8ICpsaW5lID09 ICdcdCcpIHsKKyAgICAgICAgICAgIC8vIENvbnRpbnVhdGlvbiBvZiB0aGUgcHJldmlvdXMgaGVh ZGVyCisgICAgICAgICAgICBpZiAobGFzdEhlYWRlcktleS5pc051bGwoKSkgeworICAgICAgICAg ICAgICAgIC8vIG1hbGZvcm1lZCBoZWFkZXI7IGlnbm9yZSBpdCBhbmQgY29udGludWUKKyAgICAg ICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIH0gCisgICAgICAgICAgICAKKyAgICAg ICAgICAgIC8vIE1lcmdlIHRoZSBjb250aW51YXRpb24gb2YgdGhlIHByZXZpb3VzIGhlYWRlcgor ICAgICAgICAgICAgU3RyaW5nIGN1cnJlbnRWYWx1ZSA9IGhlYWRlckZpZWxkcy5nZXQobGFzdEhl YWRlcktleSk7CisgICAgICAgICAgICBTdHJpbmcgbmV3VmFsdWUobGluZSwgbGluZUxlbmd0aCk7 CisgICAgICAgICAgICAKKyAgICAgICAgICAgIGhlYWRlckZpZWxkcy5zZXQobGFzdEhlYWRlcktl eSwgY3VycmVudFZhbHVlICsgbmV3VmFsdWUpOworICAgICAgICB9IGVsc2UgeworICAgICAgICAg ICAgLy8gQnJhbmQgbmV3IGhlYWRlcgorICAgICAgICAgICAgY29uc3QgY2hhciogY29sb24gPSBs aW5lOworICAgICAgICAgICAgd2hpbGUgKCpjb2xvbiAhPSAnOicgJiYgY29sb24gIT0gZW5kT2ZM aW5lKQorICAgICAgICAgICAgICAgIGNvbG9uKys7CisKKyAgICAgICAgICAgIGlmIChjb2xvbiA9 PSBlbmRPZkxpbmUpIHsKKyAgICAgICAgICAgICAgICAvLyBtYWxmb3JtZWQgaGVhZGVyOyBpZ25v cmUgaXQgYW5kIGNvbnRpbnVlCisgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAg ICB9CisKKyAgICAgICAgICAgIGxhc3RIZWFkZXJLZXkgPSBjYXBpdGFsaXplUkZDODIySGVhZGVy RmllbGROYW1lKFN0cmluZyhsaW5lLCBjb2xvbiAtIGxpbmUpKTsKKyAgICAgICAgICAgIFN0cmlu ZyB2YWx1ZTsKKyAgICAgICAgICAgIAorICAgICAgICAgICAgZm9yIChjb2xvbisrOyBjb2xvbiAh PSBlbmRPZkxpbmU7IGNvbG9uKyspIHsKKyAgICAgICAgICAgICAgICBpZiAoKmNvbG9uICE9ICcg JyAmJiAqY29sb24gIT0gJ1x0JykKKyAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAg ICAgICB9CisgICAgICAgICAgICBpZiAoY29sb24gPT0gZW5kT2ZMaW5lKQorICAgICAgICAgICAg ICAgIHZhbHVlID0gIiI7CisgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgdmFsdWUg PSBTdHJpbmcoY29sb24sIGVuZE9mTGluZSAtIGNvbG9uKTsKKyAgICAgICAgICAgIAorICAgICAg ICAgICAgU3RyaW5nIG9sZFZhbHVlID0gaGVhZGVyRmllbGRzLmdldChsYXN0SGVhZGVyS2V5KTsK KyAgICAgICAgICAgIGlmICghb2xkVmFsdWUuaXNOdWxsKCkpIHsKKyAgICAgICAgICAgICAgICBT dHJpbmcgdG1wID0gb2xkVmFsdWU7CisgICAgICAgICAgICAgICAgdG1wICs9ICIsICI7CisgICAg ICAgICAgICAgICAgdG1wICs9IHZhbHVlOworICAgICAgICAgICAgICAgIHZhbHVlID0gdG1wOwor ICAgICAgICAgICAgfQorICAgICAgICAgICAgCisgICAgICAgICAgICBoZWFkZXJGaWVsZHMuc2V0 KGxhc3RIZWFkZXJLZXksIHZhbHVlKTsKKyAgICAgICAgfQorICAgIH0KKworICAgIHJldHVybiBo ZWFkZXJGaWVsZHM7Cit9CiAgICAgCitzdGF0aWMgTlBFcnJvciBwYXJzZVBvc3RCdWZmZXIoYm9v bCBpc0ZpbGUsIGNvbnN0IGNoYXIgKmJ1ZmZlciwgdWludDMyX3QgbGVuZ3RoLCBib29sIHBhcnNl SGVhZGVycywgSFRUUEhlYWRlck1hcCYgaGVhZGVyRmllbGRzLCBWZWN0b3I8Y2hhcj4mIGJvZHlE YXRhKQoreworICAgIFJlZlB0cjxTaGFyZWRCdWZmZXI+IGZpbGVDb250ZW50czsKKyAgICBjb25z dCBjaGFyKiBwb3N0QnVmZmVyID0gMDsKKyAgICB1aW50MzJfdCBwb3N0QnVmZmVyU2l6ZSA9IDA7 CisKKyAgICBpZiAoaXNGaWxlKSB7CisgICAgICAgIGZpbGVDb250ZW50cyA9IFNoYXJlZEJ1ZmZl cjo6Y3JlYXRlV2l0aENvbnRlbnRzT2ZGaWxlKFN0cmluZzo6ZnJvbVVURjgoYnVmZmVyKSk7Cisg ICAgICAgIGlmICghZmlsZUNvbnRlbnRzKQorICAgICAgICAgICAgcmV0dXJuIE5QRVJSX0ZJTEVf Tk9UX0ZPVU5EOworCisgICAgICAgIHBvc3RCdWZmZXIgPSBmaWxlQ29udGVudHMtPmRhdGEoKTsK KyAgICAgICAgcG9zdEJ1ZmZlclNpemUgPSBmaWxlQ29udGVudHMtPnNpemUoKTsKKyAgICB9IGVs c2UgeworICAgICAgICBwb3N0QnVmZmVyID0gYnVmZmVyOworICAgICAgICBwb3N0QnVmZmVyU2l6 ZSA9IGxlbmd0aDsKKyAgICB9CisKKyAgICBpZiAocGFyc2VIZWFkZXJzKSB7CisgICAgICAgIGlm IChzdGFydHNXaXRoQmxhbmtMaW5lKHBvc3RCdWZmZXIsIHBvc3RCdWZmZXJTaXplKSkgeworICAg ICAgICAgICAgcG9zdEJ1ZmZlcisrOworICAgICAgICAgICAgcG9zdEJ1ZmZlclNpemUtLTsKKyAg ICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIGludCBsb2NhdGlvbiA9IGxvY2F0aW9uQWZ0ZXJG aXJzdEJsYW5rTGluZShwb3N0QnVmZmVyLCBwb3N0QnVmZmVyU2l6ZSk7CisgICAgICAgICAgICBp ZiAobG9jYXRpb24gIT0gLTEpIHsKKyAgICAgICAgICAgICAgICAvLyBJZiB0aGUgYmxhbmsgbGlu ZSBpcyBzb21ld2hlcmUgaW4gdGhlIG1pZGRsZSBvZiB0aGUgYnVmZmVyLCBldmVyeXRoaW5nIGJl Zm9yZSBpcyB0aGUgaGVhZGVyCisgICAgICAgICAgICAgICAgaGVhZGVyRmllbGRzID0gcGFyc2VS RkM4MjJIZWFkZXJGaWVsZHMocG9zdEJ1ZmZlciwgbG9jYXRpb24pOworICAgICAgICAgICAgICAg IHVuc2lnbmVkIGRhdGFMZW5ndGggPSBwb3N0QnVmZmVyU2l6ZSAtIGxvY2F0aW9uOworICAgICAg ICAgICAgICAgIAorICAgICAgICAgICAgICAgIC8vIFNvbWV0aW1lcyBwbHVnaW5zIGxpa2UgdG8g c2V0IENvbnRlbnQtTGVuZ3RoIHRoZW1zZWx2ZXMgd2hlbiB0aGV5IHBvc3QsCisgICAgICAgICAg ICAgICAgLy8gYnV0IFdlYkZvdW5kYXRpb24gZG9lcyBub3QgbGlrZSB0aGF0LiBTbyB3ZSB3aWxs IHJlbW92ZSB0aGUgaGVhZGVyCisgICAgICAgICAgICAgICAgLy8gYW5kIGluc3RlYWQgdHJ1bmNh dGUgdGhlIGRhdGEgdG8gdGhlIHJlcXVlc3RlZCBsZW5ndGguCisgICAgICAgICAgICAgICAgU3Ry aW5nIGNvbnRlbnRMZW5ndGggPSBoZWFkZXJGaWVsZHMuZ2V0KCJDb250ZW50LUxlbmd0aCIpOwor ICAgICAgICAgICAgICAgIAorICAgICAgICAgICAgICAgIGlmICghY29udGVudExlbmd0aC5pc051 bGwoKSkKKyAgICAgICAgICAgICAgICAgICAgZGF0YUxlbmd0aCA9IG1pbihjb250ZW50TGVuZ3Ro LnRvSW50KCksIChpbnQpZGF0YUxlbmd0aCk7CisgICAgICAgICAgICAgICAgaGVhZGVyRmllbGRz LnJlbW92ZSgiQ29udGVudC1MZW5ndGgiKTsKKyAgICAgICAgICAgICAgICAKKyAgICAgICAgICAg ICAgICBwb3N0QnVmZmVyICs9IGxvY2F0aW9uOworICAgICAgICAgICAgICAgIHBvc3RCdWZmZXJT aXplID0gZGF0YUxlbmd0aDsKKyAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgIH0KKyAgICAg ICAgfQorICAgIH0KKworICAgIEFTU0VSVChib2R5RGF0YS5pc0VtcHR5KCkpOworICAgIGJvZHlE YXRhLmFwcGVuZChwb3N0QnVmZmVyLCBwb3N0QnVmZmVyU2l6ZSk7CisKKyAgICByZXR1cm4gTlBF UlJfTk9fRVJST1I7Cit9CisKIHN0YXRpYyBOUEVycm9yIE5QTl9HZXRVUkwoTlBQIGluc3RhbmNl LCBjb25zdCBjaGFyKiB1cmwsIGNvbnN0IGNoYXIqIHRhcmdldCkKIHsKICAgICBub3RJbXBsZW1l bnRlZCgpOwpAQCAtMTM4LDEzICszNTEsMjMgQEAgc3RhdGljIE5QRXJyb3IgTlBOX0dldFVSTE5v dGlmeShOUFAgbnBwLCBjb25zdCBjaGFyKiB1cmwsIGNvbnN0IGNoYXIqIHRhcmdldCwgdm8KICAg ICAgICAgcmV0dXJuIE5QRVJSX0dFTkVSSUNfRVJST1I7CiAKICAgICBSZWZQdHI8TmV0c2NhcGVQ bHVnaW4+IHBsdWdpbiA9IE5ldHNjYXBlUGx1Z2luOjpmcm9tTlBQKG5wcCk7Ci0gICAgcGx1Z2lu LT5sb2FkVVJMKG1ha2VVUkxTdHJpbmcodXJsKSwgdGFyZ2V0LCB0cnVlLCBub3RpZnlEYXRhKTsK KyAgICBwbHVnaW4tPmxvYWRVUkwoIkdFVCIsIG1ha2VVUkxTdHJpbmcodXJsKSwgdGFyZ2V0LCBI VFRQSGVhZGVyTWFwKCksIFZlY3RvcjxjaGFyPigpLCB0cnVlLCBub3RpZnlEYXRhKTsKICAgICAK ICAgICByZXR1cm4gTlBFUlJfTk9fRVJST1I7CiB9CiAKLXN0YXRpYyBOUEVycm9yIE5QTl9Qb3N0 VVJMTm90aWZ5KE5QUCBpbnN0YW5jZSwgY29uc3QgY2hhciogdXJsLCBjb25zdCBjaGFyKiB0YXJn ZXQsIHVpbnQzMl90IGxlbiwgY29uc3QgY2hhciogYnVmLCBOUEJvb2wgZmlsZSwgdm9pZCogbm90 aWZ5RGF0YSkKK3N0YXRpYyBOUEVycm9yIE5QTl9Qb3N0VVJMTm90aWZ5KE5QUCBucHAsIGNvbnN0 IGNoYXIqIHVybCwgY29uc3QgY2hhciogdGFyZ2V0LCB1aW50MzJfdCBsZW4sIGNvbnN0IGNoYXIq IGJ1ZiwgTlBCb29sIGZpbGUsIHZvaWQqIG5vdGlmeURhdGEpCiB7CisgICAgSFRUUEhlYWRlck1h cCBoZWFkZXJGaWVsZHM7CisgICAgVmVjdG9yPGNoYXI+IHBvc3REYXRhOworICAgIE5QRXJyb3Ig ZXJyb3IgPSBwYXJzZVBvc3RCdWZmZXIoZmlsZSwgYnVmLCBsZW4sIHRydWUsIGhlYWRlckZpZWxk cywgcG9zdERhdGEpOworICAgIGlmIChlcnJvciAhPSBOUEVSUl9OT19FUlJPUikKKyAgICAgICAg cmV0dXJuIGVycm9yOworCisgICAgUmVmUHRyPE5ldHNjYXBlUGx1Z2luPiBwbHVnaW4gPSBOZXRz Y2FwZVBsdWdpbjo6ZnJvbU5QUChucHApOworICAgIHBsdWdpbi0+bG9hZFVSTCgiUE9TVCIsIG1h a2VVUkxTdHJpbmcodXJsKSwgdGFyZ2V0LCBoZWFkZXJGaWVsZHMsIHBvc3REYXRhLCB0cnVlLCBu b3RpZnlEYXRhKTsKKyAgICByZXR1cm4gTlBFUlJfTk9fRVJST1I7CisgICAgCiAgICAgbm90SW1w bGVtZW50ZWQoKTsKICAgICByZXR1cm4gTlBFUlJfR0VORVJJQ19FUlJPUjsKIH0KZGlmZiAtLWdp dCBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlUGx1Z2luLmNw cCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlUGx1Z2luLmNw cAppbmRleCA2ZDY3ZjhjN2E1MWMxZTk4Mzg1MzU4MmMxNjMyZDNmMWEwZWVjNGIxLi4wOTc2YWZm ZGQzOWIwNjY3YTk1MTgxZDQyZDIyYjYyYTJkMDRmYjdlIDEwMDY0NAotLS0gYS9XZWJLaXQyL1dl YlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5jcHAKKysrIGIvV2ViS2l0 Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uY3BwCkBAIC0yOCw2 ICsyOCw3IEBACiAjaW5jbHVkZSAiTmV0c2NhcGVQbHVnaW5TdHJlYW0uaCIKICNpbmNsdWRlICJQ bHVnaW5Db250cm9sbGVyLmgiCiAjaW5jbHVkZSA8V2ViQ29yZS9HcmFwaGljc0NvbnRleHQuaD4K KyNpbmNsdWRlIDxXZWJDb3JlL0hUVFBIZWFkZXJNYXAuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0lu dFJlY3QuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0tVUkwuaD4KICNpbmNsdWRlIDx1dGlsaXR5PgpA QCAtMTAxLDE0ICsxMDIsMTMgQEAgY29uc3QgY2hhciogTmV0c2NhcGVQbHVnaW46OnVzZXJBZ2Vu dCgpCiAgICAgcmV0dXJuIG1fdXNlckFnZW50LmRhdGEoKTsKIH0KIAotdm9pZCBOZXRzY2FwZVBs dWdpbjo6bG9hZFVSTChjb25zdCBTdHJpbmcmIHVybFN0cmluZywgY29uc3QgU3RyaW5nJiB0YXJn ZXQsIGJvb2wgc2VuZE5vdGlmaWNhdGlvbiwgdm9pZCogbm90aWZpY2F0aW9uRGF0YSkKK3ZvaWQg TmV0c2NhcGVQbHVnaW46OmxvYWRVUkwoY29uc3QgU3RyaW5nJiBtZXRob2QsIGNvbnN0IFN0cmlu ZyYgdXJsU3RyaW5nLCBjb25zdCBTdHJpbmcmIHRhcmdldCwgY29uc3QgSFRUUEhlYWRlck1hcCYg aGVhZGVyRmllbGRzLCBjb25zdCBWZWN0b3I8Y2hhcj4mIGh0dHBCb2R5LAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBib29sIHNlbmROb3RpZmljYXRpb24sIHZvaWQqIG5vdGlmaWNhdGlv bkRhdGEpCiB7CiAgICAgdWludDY0X3QgcmVxdWVzdElEID0gKyttX25leHRSZXF1ZXN0SUQ7Ci0K LSAgICAvLyBGSVhNRTogSGFuZGxlIHBvcHVwcy4KLSAgICBib29sIGFsbG93UG9wdXBzID0gZmFs c2U7Ci0gICAgbV9wbHVnaW5Db250cm9sbGVyLT5sb2FkVVJMKHJlcXVlc3RJRCwgdXJsU3RyaW5n LCB0YXJnZXQsIGFsbG93UG9wdXBzKTsKICAgICAKKyAgICBtX3BsdWdpbkNvbnRyb2xsZXItPmxv YWRVUkwocmVxdWVzdElELCBtZXRob2QsIHVybFN0cmluZywgdGFyZ2V0LCBoZWFkZXJGaWVsZHMs IGh0dHBCb2R5LCBhbGxvd1BvcHVwcygpKTsKKwogICAgIGlmICh0YXJnZXQuaXNOdWxsKCkpIHsK ICAgICAgICAgLy8gVGhlIGJyb3dzZXIgaXMgZ29pbmcgdG8gc2VuZCB0aGUgZGF0YSBpbiBhIHN0 cmVhbSwgY3JlYXRlIGEgcGx1Zy1pbiBzdHJlYW0uCiAgICAgICAgIFJlZlB0cjxOZXRzY2FwZVBs dWdpblN0cmVhbT4gcGx1Z2luU3RyZWFtID0gTmV0c2NhcGVQbHVnaW5TdHJlYW06OmNyZWF0ZSh0 aGlzLCByZXF1ZXN0SUQsIHNlbmROb3RpZmljYXRpb24sIG5vdGlmaWNhdGlvbkRhdGEpOwpAQCAt MjQ5LDYgKzI0OSwxMiBAQCB2b2lkIE5ldHNjYXBlUGx1Z2luOjpzdG9wQWxsU3RyZWFtcygpCiAg ICAgICAgIHN0cmVhbXNbaV0tPnN0b3AoTlBSRVNfVVNFUl9CUkVBSyk7CiB9CiAKK2Jvb2wgTmV0 c2NhcGVQbHVnaW46OmFsbG93UG9wdXBzKCkgY29uc3QKK3sKKyAgICAvLyBGSVhNRTogSGFuZGxl IHBvcHVwcy4KKyAgICByZXR1cm4gZmFsc2U7Cit9CisKIGJvb2wgTmV0c2NhcGVQbHVnaW46Omlu aXRpYWxpemUoUGx1Z2luQ29udHJvbGxlciogcGx1Z2luQ29udHJvbGxlciwgY29uc3QgUGFyYW1l dGVycyYgcGFyYW1ldGVycykKIHsKICAgICBBU1NFUlQoIW1fcGx1Z2luQ29udHJvbGxlcik7CkBA IC0yOTgsNyArMzA0LDcgQEAgYm9vbCBOZXRzY2FwZVBsdWdpbjo6aW5pdGlhbGl6ZShQbHVnaW5D b250cm9sbGVyKiBwbHVnaW5Db250cm9sbGVyLCBjb25zdCBQYXJhbWUKIAogICAgIC8vIExvYWQg dGhlIHNyYyBVUkwgaWYgbmVlZGVkLgogICAgIGlmICghcGFyYW1ldGVycy51cmwuaXNFbXB0eSgp ICYmIHNob3VsZExvYWRTcmNVUkwoKSkKLSAgICAgICAgbG9hZFVSTChwYXJhbWV0ZXJzLnVybC5z dHJpbmcoKSwgU3RyaW5nKCksIGZhbHNlLCAwKTsKKyAgICAgICAgbG9hZFVSTCgiR0VUIiwgcGFy YW1ldGVycy51cmwuc3RyaW5nKCksIFN0cmluZygpLCBIVFRQSGVhZGVyTWFwKCksIFZlY3Rvcjxj aGFyPigpLCBmYWxzZSwgMCk7CiAgICAgCiAgICAgcmV0dXJuIHRydWU7CiB9CmRpZmYgLS1naXQg YS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5oIGIv V2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uaAppbmRl eCA4OGI0N2JkZDYzOTViNzQ2YzE0YjkzYzMxNmE1YjJlMjQ1OTYwNzE1Li5lNmVlZTg0NTNmODBj M2RjNmIyYzg4MTQ3YTMzODE0OTAyZmQ1MTM2IDEwMDY0NAotLS0gYS9XZWJLaXQyL1dlYlByb2Nl c3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5oCisrKyBiL1dlYktpdDIvV2ViUHJv Y2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlUGx1Z2luLmgKQEAgLTMxLDYgKzMxLDEwIEBA CiAjaW5jbHVkZSA8V2ViQ29yZS9JbnRSZWN0Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9TdHJpbmdI YXNoLmg+CiAKK25hbWVzcGFjZSBXZWJDb3JlIHsKKyAgICBjbGFzcyBIVFRQSGVhZGVyTWFwOwor fQorCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAogY2xhc3MgTmV0c2NhcGVQbHVnaW5TdHJlYW07CkBA IC01Miw3ICs1Niw4IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgaW52YWxpZGF0ZShjb25zdCBOUFJl Y3QqKTsKICAgICBjb25zdCBjaGFyKiB1c2VyQWdlbnQoKTsKLSAgICB2b2lkIGxvYWRVUkwoY29u c3QgV2ViQ29yZTo6U3RyaW5nJiB1cmxTdHJpbmcsIGNvbnN0IFdlYkNvcmU6OlN0cmluZyYgdGFy Z2V0LCBib29sIHNlbmROb3RpZmljYXRpb24sIHZvaWQqIG5vdGlmaWNhdGlvbkRhdGEpOworICAg IHZvaWQgbG9hZFVSTChjb25zdCBXZWJDb3JlOjpTdHJpbmcmIG1ldGhvZCwgY29uc3QgV2ViQ29y ZTo6U3RyaW5nJiB1cmxTdHJpbmcsIGNvbnN0IFdlYkNvcmU6OlN0cmluZyYgdGFyZ2V0LCBjb25z dCBXZWJDb3JlOjpIVFRQSGVhZGVyTWFwJiBoZWFkZXJGaWVsZHMsCisgICAgICAgICAgICAgICAg IGNvbnN0IFZlY3RvcjxjaGFyPiYgaHR0cEJvZHksIGJvb2wgc2VuZE5vdGlmaWNhdGlvbiwgdm9p ZCogbm90aWZpY2F0aW9uRGF0YSk7CiAgICAgTlBFcnJvciBkZXN0cm95U3RyZWFtKE5QU3RyZWFt KiwgTlBSZWFzb24pOwogCiAgICAgLy8gVGhlc2UgcmV0dXJuIHJldGFpbmVkIG9iamVjdHMuCkBA IC03OSwxMiArODQsMTIgQEAgcHJpdmF0ZToKICAgICB2b2lkIGNhbGxTZXRXaW5kb3coKTsKICAg ICBib29sIHNob3VsZExvYWRTcmNVUkwoKTsKICAgICBOZXRzY2FwZVBsdWdpblN0cmVhbSogc3Ry ZWFtRnJvbUlEKHVpbnQ2NF90IHN0cmVhbUlEKTsKKyAgICB2b2lkIHN0b3BBbGxTdHJlYW1zKCk7 CisgICAgYm9vbCBhbGxvd1BvcHVwcygpIGNvbnN0OwogCiAgICAgYm9vbCBwbGF0Zm9ybVBvc3RJ bml0aWFsaXplKCk7CiAgICAgdm9pZCBwbGF0Zm9ybVBhaW50KFdlYkNvcmU6OkdyYXBoaWNzQ29u dGV4dCosIGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIGRpcnR5UmVjdCk7CiAKLSAgICB2b2lkIHN0 b3BBbGxTdHJlYW1zKCk7Ci0KICAgICAvLyBQbHVnaW4KICAgICB2aXJ0dWFsIGJvb2wgaW5pdGlh bGl6ZShQbHVnaW5Db250cm9sbGVyKiwgY29uc3QgUGFyYW1ldGVycyYpOwogICAgIHZpcnR1YWwg dm9pZCBkZXN0cm95KCk7CmRpZmYgLS1naXQgYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9Q bHVnaW5Db250cm9sbGVyLmggYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Db250 cm9sbGVyLmgKaW5kZXggYmJhNmRjOWE4OWM3ZmUzMWM2YzA1NGI3YjVlYjljODg3ZGFkZTc4OS4u MmRkNmI4YjAzMGIwYzRjMTVlZmZhMTFjMWM2ZjA5NWY3ZGM2YmE4ZSAxMDA2NDQKLS0tIGEvV2Vi S2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luQ29udHJvbGxlci5oCisrKyBiL1dlYktpdDIv V2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbkNvbnRyb2xsZXIuaApAQCAtMjksNiArMjksNyBAQAog c3RydWN0IE5QT2JqZWN0OwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CisgICAgY2xhc3MgSFRUUEhl YWRlck1hcDsKICAgICBjbGFzcyBJbnRSZWN0OwogICAgIGNsYXNzIEtVUkw7CiAgICAgY2xhc3Mg U3RyaW5nOwpAQCAtNTEsNyArNTIsOCBAQCBwdWJsaWM6CiAgICAgLy8gZmFpbHMgdG8gbG9hZCwg UGx1Z2luOjpmcmFtZURpZEZhaWxUb0xvYWQgd2lsbCBiZSBjYWxsZWQuCiAgICAgLy8KICAgICAv LyBJZiB0aGUgVVJMIGlzIGEgSmF2YVNjcmlwdCBVUkwsIHRoZSBKYXZhU2NyaXB0IGNvZGUgd2ls bCBiZSBldmFsdWF0ZWQgYW5kIHRoZSByZXN1bHQgc2VudCBiYWNrIHVzaW5nIFBsdWdpbjo6ZGlk RXZhbHVhdGVKYXZhU2NyaXB0LgotICAgIHZpcnR1YWwgdm9pZCBsb2FkVVJMKHVpbnQ2NF90IHJl cXVlc3RJRCwgY29uc3QgV2ViQ29yZTo6U3RyaW5nJiB1cmxTdHJpbmcsIGNvbnN0IFdlYkNvcmU6 OlN0cmluZyYgdGFyZ2V0LCBib29sIGFsbG93UG9wdXBzKSA9IDA7CisgICAgdmlydHVhbCB2b2lk IGxvYWRVUkwodWludDY0X3QgcmVxdWVzdElELCBjb25zdCBXZWJDb3JlOjpTdHJpbmcmIG1ldGhv ZCwgY29uc3QgV2ViQ29yZTo6U3RyaW5nJiB1cmxTdHJpbmcsIGNvbnN0IFdlYkNvcmU6OlN0cmlu ZyYgdGFyZ2V0LCAKKyAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBXZWJDb3JlOjpIVFRQ SGVhZGVyTWFwJiBoZWFkZXJGaWVsZHMsIGNvbnN0IFZlY3RvcjxjaGFyPiYgaHR0cEJvZHksIGJv b2wgYWxsb3dQb3B1cHMpID0gMDsKIAogICAgIC8vLyBDYW5jZWxzIHRoZSBsb2FkIG9mIGEgc3Ry ZWFtIHRoYXQgd2FzIHJlcXVlc3RlZCBieSBsb2FkVVJMLgogICAgIHZpcnR1YWwgdm9pZCBjYW5j ZWxTdHJlYW1Mb2FkKHVpbnQ2NF90IHN0cmVhbUlEKSA9IDA7CmRpZmYgLS1naXQgYS9XZWJLaXQy L1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9Q bHVnaW5zL1BsdWdpblZpZXcuY3BwCmluZGV4IDYxMmI0NmY1ZjdkZWZjODcwNGMwZmRlMTg2YTYw N2Q4ZDA3NzBmZGEuLjljMjQ2NmQ4OTlhMWM0ZDdlNWE4N2QwMWVhZmY0Mjk0MTE1MzUyZmUgMTAw NjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3BwCisrKyBi L1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3BwCkBAIC01MjAsMTMgKzUy MCwxNiBAQCBTdHJpbmcgUGx1Z2luVmlldzo6dXNlckFnZW50KGNvbnN0IEtVUkwmIHVybCkKICAg ICByZXR1cm4gZnJhbWUtPmxvYWRlcigpLT5jbGllbnQoKS0+dXNlckFnZW50KHVybCk7CiB9CiAK LXZvaWQgUGx1Z2luVmlldzo6bG9hZFVSTCh1aW50NjRfdCByZXF1ZXN0SUQsIGNvbnN0IFN0cmlu ZyYgdXJsU3RyaW5nLCBjb25zdCBTdHJpbmcmIHRhcmdldCwgYm9vbCBhbGxvd1BvcHVwcykKK3Zv aWQgUGx1Z2luVmlldzo6bG9hZFVSTCh1aW50NjRfdCByZXF1ZXN0SUQsIGNvbnN0IFN0cmluZyYg bWV0aG9kLCBjb25zdCBTdHJpbmcmIHVybFN0cmluZywgY29uc3QgU3RyaW5nJiB0YXJnZXQsIAor ICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IEhUVFBIZWFkZXJNYXAmIGhlYWRlckZpZWxk cywgY29uc3QgVmVjdG9yPGNoYXI+JiBodHRwQm9keSwgYm9vbCBhbGxvd1BvcHVwcykKIHsKICAg ICBGcmFtZUxvYWRSZXF1ZXN0IGZyYW1lTG9hZFJlcXVlc3Q7CiAgICAgZnJhbWVMb2FkUmVxdWVz dC5zZXRGcmFtZU5hbWUodGFyZ2V0KTsKLSAgICBmcmFtZUxvYWRSZXF1ZXN0LnJlc291cmNlUmVx dWVzdCgpLnNldEhUVFBNZXRob2QoIkdFVCIpOworICAgIGZyYW1lTG9hZFJlcXVlc3QucmVzb3Vy Y2VSZXF1ZXN0KCkuc2V0SFRUUE1ldGhvZChtZXRob2QpOwogICAgIGZyYW1lTG9hZFJlcXVlc3Qu cmVzb3VyY2VSZXF1ZXN0KCkuc2V0VVJMKG1fcGx1Z2luRWxlbWVudC0+ZG9jdW1lbnQoKS0+Y29t cGxldGVVUkwodXJsU3RyaW5nKSk7Ci0gICAgCisgICAgZnJhbWVMb2FkUmVxdWVzdC5yZXNvdXJj ZVJlcXVlc3QoKS5hZGRIVFRQSGVhZGVyRmllbGRzKGhlYWRlckZpZWxkcyk7CisgICAgZnJhbWVM b2FkUmVxdWVzdC5yZXNvdXJjZVJlcXVlc3QoKS5zZXRIVFRQQm9keShGb3JtRGF0YTo6Y3JlYXRl KGh0dHBCb2R5LmRhdGEoKSwgaHR0cEJvZHkuc2l6ZSgpKSk7CisKICAgICBtX3BlbmRpbmdVUkxS ZXF1ZXN0cy5hcHBlbmQoVVJMUmVxdWVzdDo6Y3JlYXRlKHJlcXVlc3RJRCwgZnJhbWVMb2FkUmVx dWVzdCwgYWxsb3dQb3B1cHMpKTsKICAgICBtX3BlbmRpbmdVUkxSZXF1ZXN0c1RpbWVyLnN0YXJ0 T25lU2hvdCgwKTsKIH0KZGlmZiAtLWdpdCBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1Bs dWdpblZpZXcuaCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuaAppbmRl eCAwZDgyYzljNzM0MTNiNzMyZGU2ODI2Y2I4Njc5MDE3NzQ0ZmRiNDQyLi4xMDM2MDA5MWFlNmIz YzI3MzI2NDNiOWQyOTEzNWZlNjU0NmY1YzliIDEwMDY0NAotLS0gYS9XZWJLaXQyL1dlYlByb2Nl c3MvUGx1Z2lucy9QbHVnaW5WaWV3LmgKKysrIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMv UGx1Z2luVmlldy5oCkBAIC05Miw3ICs5Miw4IEBAIHByaXZhdGU6CiAgICAgLy8gUGx1Z2luQ29u dHJvbGxlcgogICAgIHZpcnR1YWwgdm9pZCBpbnZhbGlkYXRlKGNvbnN0IFdlYkNvcmU6OkludFJl Y3QmKTsKICAgICB2aXJ0dWFsIFdlYkNvcmU6OlN0cmluZyB1c2VyQWdlbnQoY29uc3QgV2ViQ29y ZTo6S1VSTCYpOwotICAgIHZpcnR1YWwgdm9pZCBsb2FkVVJMKHVpbnQ2NF90IHJlcXVlc3RJRCwg Y29uc3QgV2ViQ29yZTo6U3RyaW5nJiB1cmxTdHJpbmcsIGNvbnN0IFdlYkNvcmU6OlN0cmluZyYg dGFyZ2V0LCBib29sIGFsbG93UG9wdXBzKTsKKyAgICB2aXJ0dWFsIHZvaWQgbG9hZFVSTCh1aW50 NjRfdCByZXF1ZXN0SUQsIGNvbnN0IFdlYkNvcmU6OlN0cmluZyYgbWV0aG9kLCBjb25zdCBXZWJD b3JlOjpTdHJpbmcmIHVybFN0cmluZywgY29uc3QgV2ViQ29yZTo6U3RyaW5nJiB0YXJnZXQsIAor ICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IFdlYkNvcmU6OkhUVFBIZWFkZXJNYXAmIGhl YWRlckZpZWxkcywgY29uc3QgVmVjdG9yPGNoYXI+JiBodHRwQm9keSwgYm9vbCBhbGxvd1BvcHVw cyk7CiAgICAgdmlydHVhbCB2b2lkIGNhbmNlbFN0cmVhbUxvYWQodWludDY0X3Qgc3RyZWFtSUQp OwogICAgIHZpcnR1YWwgTlBPYmplY3QqIHdpbmRvd1NjcmlwdE5QT2JqZWN0KCk7CiAgICAgdmly dHVhbCBOUE9iamVjdCogcGx1Z2luRWxlbWVudE5QT2JqZWN0KCk7Cg==