63332 2011-06-24 10:51:06 -0700 Safari will quit unexpectedly when launching Safari in the first time (crash in initQTSecurityPolicyNoLocalToRemoteSiteAttribute) 2011-06-24 17:16:45 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED InRadar, PlatformOnly P2 Normal --- 1 jer.noble jer.noble eric.carlson oldest_to_newest 426967 0 jer.noble 2011-06-24 10:51:06 -0700 Safari will quit unexpectedly when launching Safari in the first time (crash in initQTSecurityPolicyNoLocalToRemoteSiteAttribute) 426969 1 jer.noble 2011-06-24 10:52:06 -0700 Only occurs on Leopard if QTKit < 7.6.3 is installed. <rdar://problem/9661650> 426983 2 98511 jer.noble 2011-06-24 10:57:30 -0700 Created attachment 98511 Patch 426995 3 98511 eric.carlson 2011-06-24 11:11:26 -0700 Comment on attachment 98511 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=98511&action=review > Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm:252 > + if (QTSecurityPolicyNoRemoteToLocalSiteAttribute) { > + [movieAttributes setValue:[NSNumber numberWithBool:NO] forKey:QTSecurityPolicyNoCrossSiteAttribute]; > + [movieAttributes setValue:[NSNumber numberWithBool:YES] forKey:QTSecurityPolicyNoRemoteToLocalSiteAttribute]; > + [movieAttributes setValue:[NSNumber numberWithBool:YES] forKey:QTSecurityPolicyNoLocalToRemoteSiteAttribute]; > + } else > + [movieAttributes setValue:[NSNumber numberWithBool:YES] forKey:QTSecurityPolicyNoCrossSiteAttribute]; > + SOFT_LINK_POINTER asserts in a debug build. You might add a SOFT_LINK_POINTER_OPTIONAL version that does not. 427000 4 98515 jer.noble 2011-06-24 11:17:24 -0700 Created attachment 98515 Patch Addressed Eric's comment by adding SOFT_LINK_POINTER_OPTIONAL. 427030 5 98515 eric.carlson 2011-06-24 11:51:21 -0700 Comment on attachment 98515 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=98515&action=review > Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm:246 > + // Check to see if QTKit >= 7.6.3 is installed, which defines NoRemoteToLocal and NoLocalToRemote. > + // If not, just set NoCrossSite = YES, which does the same thing as NoRemoteToLocal = YES and > + // NoLocalToRemote = YES in QTKit < 7.6.3. We don't actually check the QTKit version here, so it would probably be better to say something like "... see if the current version of QTKit has NoRemoteToLocal ..." instead. 427031 6 jer.noble 2011-06-24 11:55:26 -0700 (In reply to comment #5) > (From update of attachment 98515 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=98515&action=review > > > Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm:246 > > + // Check to see if QTKit >= 7.6.3 is installed, which defines NoRemoteToLocal and NoLocalToRemote. > > + // If not, just set NoCrossSite = YES, which does the same thing as NoRemoteToLocal = YES and > > + // NoLocalToRemote = YES in QTKit < 7.6.3. > > We don't actually check the QTKit version here, so it would probably be better to say something like "... see if the current version of QTKit has NoRemoteToLocal ..." instead. How about: "Check to see if QTSecurityPolicyNoRemoteToLocalSiteAttribute is defined, which was added in QTKit 7.6.3." I thought it was important to mention that "NoCrossSite" does the right thing in versions of QTKit previous to 7.6.3. 427127 7 eric.carlson 2011-06-24 14:06:21 -0700 (In reply to comment #6) > > How about: "Check to see if QTSecurityPolicyNoRemoteToLocalSiteAttribute is defined, which was added in QTKit 7.6.3." > > I thought it was important to mention that "NoCrossSite" does the right thing in versions of QTKit previous to 7.6.3. That sounds fine. 427253 8 jer.noble 2011-06-24 17:16:45 -0700 Committed r89718: <http://trac.webkit.org/changeset/89718> 98511 2011-06-24 10:57:30 -0700 2011-06-24 11:17:21 -0700 Patch bug-63332-20110624105729.patch text/plain 3540 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogODk0OTkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBmYTE1NmZhNzcwZDU5MGIy NjcxOThiMDQ2Mzg3NzU4MmIzMjFlMGIxLi5hMTYwNzIwNjVjYmJhNjc3NmM1Mjg0OGRmMjEwNDk4 YjliMjE3YmMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDYtMjQgIEplciBO b2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgU2FmYXJpIHdpbGwgcXVpdCB1bmV4cGVjdGVkbHkgd2hlbiBs YXVuY2hpbmcgU2FmYXJpIGluIHRoZSBmaXJzdCB0aW1lIChjcmFzaCBpbiBpbml0UVRTZWN1cml0 eVBvbGljeU5vTG9jYWxUb1JlbW90ZVNpdGVBdHRyaWJ1dGUpCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MzMzMgorICAgICAgICA8cmRhcjovL3Byb2Js ZW0vOTY2MTY1MD4KKworICAgICAgICBObyBuZXcgdGVzdHM7IE9ubHkgYWZmZWN0cyBtYWNoaW5l cyB3aXRoIFFUS2l0IDwgNy42LjMgaW5zdGFsbGVkLgorCisgICAgICAgIENoZWNrIHRvIHNlZSBp ZiBRVFNlY3VyaXR5UG9saWN5Tm9SZW1vdGVUb0xvY2FsU2l0ZUF0dHJpYnV0ZSBpcyBub24tTlVM TCBiZWZvcmUgcGFzc2luZyBpdCBpbnRvIC1bUVRNb3ZpZSBpbml0V2l0aEF0dHJpYnV0ZXM6XSwK KyAgICAgICAgYXMgaXQgaXMgb25seSBkZWZpbmVkIGluIFFUS2l0ID49IDcuNi4zLiAgSWYgaXQg aXMgTlVMTCwgcGFzcyBRVFNlY3VyaXR5UG9saWN5Tm9Dcm9zc1NpdGVBdHRyaWJ1dGU9WUVTIGlu c3RlYWQsIHdoaWNoIGhhcworICAgICAgICB0aGUgc2FtZSBlZmZlY3QgaW4gZWFybGllciB2ZXJz aW9ucyBvZiBRVEtpdCBhcyB0aGUgTm9Mb2NhbFRvUmVtb3RlIGFuZCBOb1JlbW90ZVRvTG9jYWwg a2V5cy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL21hYy9NZWRpYVBsYXllclByaXZh dGVRVEtpdC5tbToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZVFUS2l0Ojpj b21tb25Nb3ZpZUF0dHJpYnV0ZXMpOgorCiAyMDExLTA2LTIyICBDaHJpcyBSb2dlcnMgIDxjcm9n ZXJzQGdvb2dsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGF2aWQgTGV2aW4uCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvTWVkaWFQbGF5ZXJQ cml2YXRlUVRLaXQubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvTWVk aWFQbGF5ZXJQcml2YXRlUVRLaXQubW0KaW5kZXggY2FjODA4ZWU3OTZlMzM0MTUxNmZlNjBkOTQy MjBiODc3ZGZmNDg0Yy4uNzg3OTlkZWM2Y2JlNzZlMTM3YTA3MWE2YmIzNDlhMDhmMWYyZmYwYSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL01lZGlhUGxh eWVyUHJpdmF0ZVFUS2l0Lm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L21hYy9NZWRpYVBsYXllclByaXZhdGVRVEtpdC5tbQpAQCAtMjM0LDE1ICsyMzQsMjIgQEAgTlNN dXRhYmxlRGljdGlvbmFyeSAqTWVkaWFQbGF5ZXJQcml2YXRlUVRLaXQ6OmNvbW1vbk1vdmllQXR0 cmlidXRlcygpCiAgICAgTlNNdXRhYmxlRGljdGlvbmFyeSAqbW92aWVBdHRyaWJ1dGVzID0gW05T TXV0YWJsZURpY3Rpb25hcnkgZGljdGlvbmFyeVdpdGhPYmplY3RzQW5kS2V5czoKICAgICAgICAg ICAgIFtOU051bWJlciBudW1iZXJXaXRoQm9vbDptX3BsYXllci0+cHJlc2VydmVzUGl0Y2goKV0s IFFUTW92aWVSYXRlQ2hhbmdlc1ByZXNlcnZlUGl0Y2hBdHRyaWJ1dGUsCiAgICAgICAgICAgICBb TlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6WUVTXSwgUVRNb3ZpZVByZXZlbnRFeHRlcm5hbFVSTExp bmtzQXR0cmlidXRlLAotICAgICAgICAgICAgW05TTnVtYmVyIG51bWJlcldpdGhCb29sOk5PXSwg UVRTZWN1cml0eVBvbGljeU5vQ3Jvc3NTaXRlQXR0cmlidXRlLAotICAgICAgICAgICAgW05TTnVt YmVyIG51bWJlcldpdGhCb29sOllFU10sIFFUU2VjdXJpdHlQb2xpY3lOb1JlbW90ZVRvTG9jYWxT aXRlQXR0cmlidXRlLAotICAgICAgICAgICAgW05TTnVtYmVyIG51bWJlcldpdGhCb29sOllFU10s IFFUU2VjdXJpdHlQb2xpY3lOb0xvY2FsVG9SZW1vdGVTaXRlQXR0cmlidXRlLAogICAgICAgICAg ICAgW05TTnVtYmVyIG51bWJlcldpdGhCb29sOk5PXSwgUVRNb3ZpZUFza1VucmVzb2x2ZWREYXRh UmVmc0F0dHJpYnV0ZSwKICAgICAgICAgICAgIFtOU051bWJlciBudW1iZXJXaXRoQm9vbDpOT10s IFFUTW92aWVMb29wc0F0dHJpYnV0ZSwKICAgICAgICAgICAgIFtOU051bWJlciBudW1iZXJXaXRo Qm9vbDohbV9wcml2YXRlQnJvd3NpbmddLCBAIlFUTW92aWVBbGxvd1BlcnNpc3RlbnRDYWNoZUF0 dHJpYnV0ZSIsCiAgICAgICAgICAgICBRVE1vdmllQXBlcnR1cmVNb2RlQ2xlYW4sIFFUTW92aWVB cGVydHVyZU1vZGVBdHRyaWJ1dGUsCiAgICAgICAgICAgICBuaWxdOwogCisgICAgLy8gQ2hlY2sg dG8gc2VlIGlmIFFUS2l0ID49IDcuNi4zIGlzIGluc3RhbGxlZCwgd2hpY2ggZGVmaW5lcyBOb1Jl bW90ZVRvTG9jYWwgYW5kIE5vTG9jYWxUb1JlbW90ZS4KKyAgICAvLyBJZiBub3QsIGp1c3Qgc2V0 IE5vQ3Jvc3NTaXRlID0gWUVTLCB3aGljaCBkb2VzIHRoZSBzYW1lIHRoaW5nIGFzIE5vUmVtb3Rl VG9Mb2NhbCA9IFlFUyBhbmQgCisgICAgLy8gTm9Mb2NhbFRvUmVtb3RlID0gWUVTIGluIFFUS2l0 IDwgNy42LjMuCisgICAgaWYgKFFUU2VjdXJpdHlQb2xpY3lOb1JlbW90ZVRvTG9jYWxTaXRlQXR0 cmlidXRlKSB7CisgICAgICAgIFttb3ZpZUF0dHJpYnV0ZXMgc2V0VmFsdWU6W05TTnVtYmVyIG51 bWJlcldpdGhCb29sOk5PXSBmb3JLZXk6UVRTZWN1cml0eVBvbGljeU5vQ3Jvc3NTaXRlQXR0cmli dXRlXTsKKyAgICAgICAgW21vdmllQXR0cmlidXRlcyBzZXRWYWx1ZTpbTlNOdW1iZXIgbnVtYmVy V2l0aEJvb2w6WUVTXSBmb3JLZXk6UVRTZWN1cml0eVBvbGljeU5vUmVtb3RlVG9Mb2NhbFNpdGVB dHRyaWJ1dGVdOworICAgICAgICBbbW92aWVBdHRyaWJ1dGVzIHNldFZhbHVlOltOU051bWJlciBu dW1iZXJXaXRoQm9vbDpZRVNdIGZvcktleTpRVFNlY3VyaXR5UG9saWN5Tm9Mb2NhbFRvUmVtb3Rl U2l0ZUF0dHJpYnV0ZV07CisgICAgfSBlbHNlCisgICAgICAgIFttb3ZpZUF0dHJpYnV0ZXMgc2V0 VmFsdWU6W05TTnVtYmVyIG51bWJlcldpdGhCb29sOllFU10gZm9yS2V5OlFUU2VjdXJpdHlQb2xp Y3lOb0Nyb3NzU2l0ZUF0dHJpYnV0ZV07CisKICAgICBpZiAobV9wcmVsb2FkIDwgTWVkaWFQbGF5 ZXI6OkF1dG8pCiAgICAgICAgIFttb3ZpZUF0dHJpYnV0ZXMgc2V0VmFsdWU6W05TTnVtYmVyIG51 bWJlcldpdGhCb29sOllFU10gZm9yS2V5OkAiUVRNb3ZpZUxpbWl0UmVhZEFoZWFkQXR0cmlidXRl Il07CiAK 98515 2011-06-24 11:17:24 -0700 2011-06-24 11:51:21 -0700 Patch bug-63332-20110624111723.patch text/plain 5815 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogODk0OTkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBmYTE1NmZhNzcwZDU5MGIy NjcxOThiMDQ2Mzg3NzU4MmIzMjFlMGIxLi5jMTBmNTQ1Mjk2ZWU3MjAwZTQ4MGIwZGY2MGFhNjI4 NjhlZDVkODlhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDYtMjQgIEplciBO b2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgU2FmYXJpIHdpbGwgcXVpdCB1bmV4cGVjdGVkbHkgd2hlbiBs YXVuY2hpbmcgU2FmYXJpIGluIHRoZSBmaXJzdCB0aW1lIChjcmFzaCBpbiBpbml0UVRTZWN1cml0 eVBvbGljeU5vTG9jYWxUb1JlbW90ZVNpdGVBdHRyaWJ1dGUpCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MzMzMgorICAgICAgICA8cmRhcjovL3Byb2Js ZW0vOTY2MTY1MD4KKworICAgICAgICBObyBuZXcgdGVzdHM7IE9ubHkgYWZmZWN0cyBtYWNoaW5l cyB3aXRoIFFUS2l0IDwgNy42LjMgaW5zdGFsbGVkLgorCisgICAgICAgIENoZWNrIHRvIHNlZSBp ZiBRVFNlY3VyaXR5UG9saWN5Tm9SZW1vdGVUb0xvY2FsU2l0ZUF0dHJpYnV0ZSBpcyBub24tTlVM TCBiZWZvcmUgcGFzc2luZyBpdCBpbnRvIC1bUVRNb3ZpZSBpbml0V2l0aEF0dHJpYnV0ZXM6XSwK KyAgICAgICAgYXMgaXQgaXMgb25seSBkZWZpbmVkIGluIFFUS2l0ID49IDcuNi4zLiAgSWYgaXQg aXMgTlVMTCwgcGFzcyBRVFNlY3VyaXR5UG9saWN5Tm9Dcm9zc1NpdGVBdHRyaWJ1dGU9WUVTIGlu c3RlYWQsIHdoaWNoIGhhcworICAgICAgICB0aGUgc2FtZSBlZmZlY3QgaW4gZWFybGllciB2ZXJz aW9ucyBvZiBRVEtpdCBhcyB0aGUgTm9Mb2NhbFRvUmVtb3RlIGFuZCBOb1JlbW90ZVRvTG9jYWwg a2V5cy4gIFRvIGF2b2lkIEFTU0VSVHMgd2hlbiBydW5uaW5nCisgICAgICAgIGRlYnVnIGJ1aWxk cyB3aXRoIGVhcmxpZXIgdmVyc2lvbnMgb2YgUVRLaXQsIGFkZCBhIFNPRlRfTElOS19QT0lOVEVS X09QVElPTkFMIG1hY3JvIHRvIFNvZnRMaW5raW5nLmggYW5kIG1ha2UgdGhlc2Uga2V5cyBvcHRp b25hbC4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL21hYy9NZWRpYVBsYXllclByaXZh dGVRVEtpdC5tbToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZVFUS2l0Ojpj b21tb25Nb3ZpZUF0dHJpYnV0ZXMpOgorICAgICAgICAqIHBsYXRmb3JtL21hYy9Tb2Z0TGlua2lu Zy5oOiBBZGQgU09GVF9MSU5LX1BPSU5URVJfT1BUSU9OQUwgbWFjcm8uCisKIDIwMTEtMDYtMjIg IENocmlzIFJvZ2VycyAgPGNyb2dlcnNAZ29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBi eSBEYXZpZCBMZXZpbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL21hYy9NZWRpYVBsYXllclByaXZhdGVRVEtpdC5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL21hYy9NZWRpYVBsYXllclByaXZhdGVRVEtpdC5tbQppbmRleCBjYWM4MDhl ZTc5NmUzMzQxNTE2ZmU2MGQ5NDIyMGI4NzdkZmY0ODRjLi42NDZiYjE1ODEwOTVhOTcxYTM4NzY4 YzVmMjQ4MjAwYmNkNTk5YWE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9tYWMvTWVkaWFQbGF5ZXJQcml2YXRlUVRLaXQubW0KKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL01lZGlhUGxheWVyUHJpdmF0ZVFUS2l0Lm1tCkBAIC05 MiwxMiArOTIsMTMgQEAgU09GVF9MSU5LX1BPSU5URVIoUVRLaXQsIFFUTW92aWVUaW1lU2NhbGVB dHRyaWJ1dGUsIE5TU3RyaW5nICopCiBTT0ZUX0xJTktfUE9JTlRFUihRVEtpdCwgUVRNb3ZpZVVS TEF0dHJpYnV0ZSwgTlNTdHJpbmcgKikKIFNPRlRfTElOS19QT0lOVEVSKFFUS2l0LCBRVE1vdmll Vm9sdW1lRGlkQ2hhbmdlTm90aWZpY2F0aW9uLCBOU1N0cmluZyAqKQogU09GVF9MSU5LX1BPSU5U RVIoUVRLaXQsIFFUU2VjdXJpdHlQb2xpY3lOb0Nyb3NzU2l0ZUF0dHJpYnV0ZSwgTlNTdHJpbmcg KikKLVNPRlRfTElOS19QT0lOVEVSKFFUS2l0LCBRVFNlY3VyaXR5UG9saWN5Tm9Mb2NhbFRvUmVt b3RlU2l0ZUF0dHJpYnV0ZSwgTlNTdHJpbmcgKikKLVNPRlRfTElOS19QT0lOVEVSKFFUS2l0LCBR VFNlY3VyaXR5UG9saWN5Tm9SZW1vdGVUb0xvY2FsU2l0ZUF0dHJpYnV0ZSwgTlNTdHJpbmcgKikK IFNPRlRfTElOS19QT0lOVEVSKFFUS2l0LCBRVFZpZGVvUmVuZGVyZXJXZWJLaXRPbmx5TmV3SW1h Z2VBdmFpbGFibGVOb3RpZmljYXRpb24sIE5TU3RyaW5nICopCiBTT0ZUX0xJTktfUE9JTlRFUihR VEtpdCwgUVRNb3ZpZUFwZXJ0dXJlTW9kZUNsZWFuLCBOU1N0cmluZyAqKQogU09GVF9MSU5LX1BP SU5URVIoUVRLaXQsIFFUTW92aWVBcGVydHVyZU1vZGVBdHRyaWJ1dGUsIE5TU3RyaW5nICopCiAK K1NPRlRfTElOS19QT0lOVEVSX09QVElPTkFMKFFUS2l0LCBRVFNlY3VyaXR5UG9saWN5Tm9Mb2Nh bFRvUmVtb3RlU2l0ZUF0dHJpYnV0ZSwgTlNTdHJpbmcgKikKK1NPRlRfTElOS19QT0lOVEVSX09Q VElPTkFMKFFUS2l0LCBRVFNlY3VyaXR5UG9saWN5Tm9SZW1vdGVUb0xvY2FsU2l0ZUF0dHJpYnV0 ZSwgTlNTdHJpbmcgKikKKwogI2RlZmluZSBRVE1vdmllIGdldFFUTW92aWVDbGFzcygpCiAjZGVm aW5lIFFUTW92aWVWaWV3IGdldFFUTW92aWVWaWV3Q2xhc3MoKQogI2RlZmluZSBRVE1vdmllTGF5 ZXIgZ2V0UVRNb3ZpZUxheWVyQ2xhc3MoKQpAQCAtMjM0LDE1ICsyMzUsMjIgQEAgTlNNdXRhYmxl RGljdGlvbmFyeSAqTWVkaWFQbGF5ZXJQcml2YXRlUVRLaXQ6OmNvbW1vbk1vdmllQXR0cmlidXRl cygpCiAgICAgTlNNdXRhYmxlRGljdGlvbmFyeSAqbW92aWVBdHRyaWJ1dGVzID0gW05TTXV0YWJs ZURpY3Rpb25hcnkgZGljdGlvbmFyeVdpdGhPYmplY3RzQW5kS2V5czoKICAgICAgICAgICAgIFtO U051bWJlciBudW1iZXJXaXRoQm9vbDptX3BsYXllci0+cHJlc2VydmVzUGl0Y2goKV0sIFFUTW92 aWVSYXRlQ2hhbmdlc1ByZXNlcnZlUGl0Y2hBdHRyaWJ1dGUsCiAgICAgICAgICAgICBbTlNOdW1i ZXIgbnVtYmVyV2l0aEJvb2w6WUVTXSwgUVRNb3ZpZVByZXZlbnRFeHRlcm5hbFVSTExpbmtzQXR0 cmlidXRlLAotICAgICAgICAgICAgW05TTnVtYmVyIG51bWJlcldpdGhCb29sOk5PXSwgUVRTZWN1 cml0eVBvbGljeU5vQ3Jvc3NTaXRlQXR0cmlidXRlLAotICAgICAgICAgICAgW05TTnVtYmVyIG51 bWJlcldpdGhCb29sOllFU10sIFFUU2VjdXJpdHlQb2xpY3lOb1JlbW90ZVRvTG9jYWxTaXRlQXR0 cmlidXRlLAotICAgICAgICAgICAgW05TTnVtYmVyIG51bWJlcldpdGhCb29sOllFU10sIFFUU2Vj dXJpdHlQb2xpY3lOb0xvY2FsVG9SZW1vdGVTaXRlQXR0cmlidXRlLAogICAgICAgICAgICAgW05T TnVtYmVyIG51bWJlcldpdGhCb29sOk5PXSwgUVRNb3ZpZUFza1VucmVzb2x2ZWREYXRhUmVmc0F0 dHJpYnV0ZSwKICAgICAgICAgICAgIFtOU051bWJlciBudW1iZXJXaXRoQm9vbDpOT10sIFFUTW92 aWVMb29wc0F0dHJpYnV0ZSwKICAgICAgICAgICAgIFtOU051bWJlciBudW1iZXJXaXRoQm9vbDoh bV9wcml2YXRlQnJvd3NpbmddLCBAIlFUTW92aWVBbGxvd1BlcnNpc3RlbnRDYWNoZUF0dHJpYnV0 ZSIsCiAgICAgICAgICAgICBRVE1vdmllQXBlcnR1cmVNb2RlQ2xlYW4sIFFUTW92aWVBcGVydHVy ZU1vZGVBdHRyaWJ1dGUsCiAgICAgICAgICAgICBuaWxdOwogCisgICAgLy8gQ2hlY2sgdG8gc2Vl IGlmIFFUS2l0ID49IDcuNi4zIGlzIGluc3RhbGxlZCwgd2hpY2ggZGVmaW5lcyBOb1JlbW90ZVRv TG9jYWwgYW5kIE5vTG9jYWxUb1JlbW90ZS4KKyAgICAvLyBJZiBub3QsIGp1c3Qgc2V0IE5vQ3Jv c3NTaXRlID0gWUVTLCB3aGljaCBkb2VzIHRoZSBzYW1lIHRoaW5nIGFzIE5vUmVtb3RlVG9Mb2Nh bCA9IFlFUyBhbmQgCisgICAgLy8gTm9Mb2NhbFRvUmVtb3RlID0gWUVTIGluIFFUS2l0IDwgNy42 LjMuCisgICAgaWYgKFFUU2VjdXJpdHlQb2xpY3lOb1JlbW90ZVRvTG9jYWxTaXRlQXR0cmlidXRl KSB7CisgICAgICAgIFttb3ZpZUF0dHJpYnV0ZXMgc2V0VmFsdWU6W05TTnVtYmVyIG51bWJlcldp dGhCb29sOk5PXSBmb3JLZXk6UVRTZWN1cml0eVBvbGljeU5vQ3Jvc3NTaXRlQXR0cmlidXRlXTsK KyAgICAgICAgW21vdmllQXR0cmlidXRlcyBzZXRWYWx1ZTpbTlNOdW1iZXIgbnVtYmVyV2l0aEJv b2w6WUVTXSBmb3JLZXk6UVRTZWN1cml0eVBvbGljeU5vUmVtb3RlVG9Mb2NhbFNpdGVBdHRyaWJ1 dGVdOworICAgICAgICBbbW92aWVBdHRyaWJ1dGVzIHNldFZhbHVlOltOU051bWJlciBudW1iZXJX aXRoQm9vbDpZRVNdIGZvcktleTpRVFNlY3VyaXR5UG9saWN5Tm9Mb2NhbFRvUmVtb3RlU2l0ZUF0 dHJpYnV0ZV07CisgICAgfSBlbHNlCisgICAgICAgIFttb3ZpZUF0dHJpYnV0ZXMgc2V0VmFsdWU6 W05TTnVtYmVyIG51bWJlcldpdGhCb29sOllFU10gZm9yS2V5OlFUU2VjdXJpdHlQb2xpY3lOb0Ny b3NzU2l0ZUF0dHJpYnV0ZV07CisKICAgICBpZiAobV9wcmVsb2FkIDwgTWVkaWFQbGF5ZXI6OkF1 dG8pCiAgICAgICAgIFttb3ZpZUF0dHJpYnV0ZXMgc2V0VmFsdWU6W05TTnVtYmVyIG51bWJlcldp dGhCb29sOllFU10gZm9yS2V5OkAiUVRNb3ZpZUxpbWl0UmVhZEFoZWFkQXR0cmlidXRlIl07CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9Tb2Z0TGlua2luZy5oIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1NvZnRMaW5raW5nLmgKaW5kZXggMDFjZTFkNWQy YmMyOTcxNTY5YmViOTBlZmEyNTM4NjA2NmUyZjFiZS4uZTlhNjk5NjliYmI3NWM2MzgyNTJlYTE3 NjlmOGM2YmY5Y2I1ZTk5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFj L1NvZnRMaW5raW5nLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1NvZnRMaW5r aW5nLmgKQEAgLTEyNCw2ICsxMjQsMjQgQEAKICAgICAgICAgcmV0dXJuIHBvaW50ZXIjI25hbWU7 IFwKICAgICB9CiAKKyNkZWZpbmUgU09GVF9MSU5LX1BPSU5URVJfT1BUSU9OQUwoZnJhbWV3b3Jr LCBuYW1lLCB0eXBlKSBcCisgICAgc3RhdGljIHR5cGUgaW5pdCMjbmFtZSgpOyBcCisgICAgc3Rh dGljIHR5cGUgKCpnZXQjI25hbWUpKCkgPSBpbml0IyNuYW1lOyBcCisgICAgc3RhdGljIHR5cGUg cG9pbnRlciMjbmFtZTsgXAorICAgIFwKKyAgICBzdGF0aWMgdHlwZSBuYW1lIyNGdW5jdGlvbigp IFwKKyAgICB7IFwKKyAgICAgICAgcmV0dXJuIHBvaW50ZXIjI25hbWU7IFwKKyAgICB9XAorICAg IFwKKyAgICBzdGF0aWMgdHlwZSBpbml0IyNuYW1lKCkgXAorICAgIHsgXAorICAgICAgICB2b2lk KiogcG9pbnRlciA9IHN0YXRpY19jYXN0PHZvaWQqKj4oZGxzeW0oZnJhbWV3b3JrIyNMaWJyYXJ5 KCksICNuYW1lKSk7IFwKKyAgICAgICAgcG9pbnRlciMjbmFtZSA9IHN0YXRpY19jYXN0PHR5cGU+ KCpwb2ludGVyKTsgXAorICAgICAgICBnZXQjI25hbWUgPSBuYW1lIyNGdW5jdGlvbjsgXAorICAg ICAgICByZXR1cm4gcG9pbnRlciMjbmFtZTsgXAorICAgIH0KKwogI2RlZmluZSBTT0ZUX0xJTktf Q09OU1RBTlQoZnJhbWV3b3JrLCBuYW1lLCB0eXBlKSBcCiAgICAgc3RhdGljIHR5cGUgaW5pdCMj bmFtZSgpOyBcCiAgICAgc3RhdGljIHR5cGUgKCpnZXQjI25hbWUpKCkgPSBpbml0IyNuYW1lOyBc Cg==