143559 2015-04-09 00:06:35 -0700 [Content Filtering] Add a HAVE(PARENTAL_CONTROLS) and use it 2015-04-09 02:29:59 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 aestes aestes benjamin cmarcelo commit-queue ddkilzer japhet mjs ossy oldest_to_newest 1083898 0 aestes 2015-04-09 00:06:35 -0700 [Content Filtering] Add a HAVE(PARENTAL_CONTROLS) and use it 1083902 1 aestes 2015-04-09 00:18:05 -0700 rdar://problem/20344609 1083903 2 250422 aestes 2015-04-09 00:21:12 -0700 Created attachment 250422 Patch 1083909 3 250422 ddkilzer 2015-04-09 00:48:15 -0700 Comment on attachment 250422 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=250422&action=review r=me > Source/WebCore/platform/cocoa/ParentalControlsContentFilter.h:33 > +#define HAVE_PARENTAL_CONTROLS PLATFORM(COCOA) && !PLATFORM(WATCHOS) I think we normally surround this with the following to prevent macro re-definition warnings: #ifndef HAVE_PARENTAL_CONTROLS ... #endif 1083910 4 aestes 2015-04-09 00:49:07 -0700 (In reply to comment #3) > Comment on attachment 250422 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=250422&action=review > > r=me Thanks! > > > Source/WebCore/platform/cocoa/ParentalControlsContentFilter.h:33 > > +#define HAVE_PARENTAL_CONTROLS PLATFORM(COCOA) && !PLATFORM(WATCHOS) > > I think we normally surround this with the following to prevent macro > re-definition warnings: > > #ifndef HAVE_PARENTAL_CONTROLS > ... > #endif Yes, you're right. Will do. 1083919 5 aestes 2015-04-09 01:55:41 -0700 Committed r182596: <http://trac.webkit.org/changeset/182596> 1083926 6 ossy 2015-04-09 02:18:31 -0700 (In reply to comment #5) > Committed r182596: <http://trac.webkit.org/changeset/182596> It broke the build on the Apple Mac bots. 1083927 7 ossy 2015-04-09 02:19:54 -0700 /Volumes/Data/slave/yosemite-release/build/Source/WebCore/platform/ContentFilterUnblockHandler.h:54:66: error: use of undeclared identifier 'WebFilterEvaluator' ContentFilterUnblockHandler(String unblockURLHost, RetainPtr<WebFilterEvaluator>); ^ /Volumes/Data/slave/yosemite-release/build/Source/WebCore/platform/ContentFilterUnblockHandler.h:73:15: error: use of undeclared identifier 'WebFilterEvaluator' RetainPtr<WebFilterEvaluator> m_webFilterEvaluator; ^ 2 errors generated. 1083930 8 aestes 2015-04-09 02:29:59 -0700 (In reply to comment #7) > /Volumes/Data/slave/yosemite-release/build/Source/WebCore/platform/ > ContentFilterUnblockHandler.h:54:66: error: use of undeclared identifier > 'WebFilterEvaluator' > ContentFilterUnblockHandler(String unblockURLHost, > RetainPtr<WebFilterEvaluator>); > ^ > /Volumes/Data/slave/yosemite-release/build/Source/WebCore/platform/ > ContentFilterUnblockHandler.h:73:15: error: use of undeclared identifier > 'WebFilterEvaluator' > RetainPtr<WebFilterEvaluator> m_webFilterEvaluator; > ^ > 2 errors generated. This should be fixed in http://trac.webkit.org/changeset/182597 250422 2015-04-09 00:21:12 -0700 2015-04-09 00:48:15 -0700 Patch bug-143559-20150409002021.patch text/plain 9340 aestes U3VidmVyc2lvbiBSZXZpc2lvbjogMTgyNTg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGIwZGU0NDMzNGY3Y2RlMGU2NDQxYmZm NTY2YWViYjViMjk3Y2Y4ZTMuLmE4YTM1ZjQ4NGZjOTdjOTBjYWQ5YTI2YjUwNWFiNGIxYzk0NGJl YjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTUtMDQtMDkgIEFuZHkgRXN0ZXMgIDxhZXN0ZXNA YXBwbGUuY29tPgorCisgICAgICAgIFtDb250ZW50IEZpbHRlcmluZ10gQWRkIGEgSEFWRShQQVJF TlRBTF9DT05UUk9MUykgYW5kIHVzZSBpdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTQzNTU5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgQWRkZWQgUExBVEZPUk0oV0FUQ0hPUykuIFVzZWQgUExBVEZPUk0o KSBzaW5jZSBXYXRjaCBPUyBpcyBqdXN0IGEgdmFyaWFudCBvZiBPUyhJT1MpLgorCisgICAgICAg ICogd3RmL1BsYXRmb3JtLmg6CisKIDIwMTUtMDQtMDggIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hy aXN0ZW5zZW5Ad2Via2l0Lm9yZz4gYW5kIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtp dC5vcmc+CiAKICAgICAgICAgQWRkIENNYWtlIGJ1aWxkIHN5c3RlbSBmb3IgV2luQ2Fpcm8gcG9y dC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZwppbmRleCAzMDljOGYyY2Y5YTJlNWQ0Njc1NWY1MGMyNTRmOGY4ZmQwY2I0ZGE2 Li42NDlkNDUxZTg3ZWJjZWMzZjkwMjU1NGZlZDIxYWM5OTU3MmFhY2FjIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjMgQEAKKzIwMTUtMDQtMDkgIEFuZHkgRXN0ZXMgIDxhZXN0ZXNAYXBwbGUuY29t PgorCisgICAgICAgIFtDb250ZW50IEZpbHRlcmluZ10gQWRkIGEgSEFWRShQQVJFTlRBTF9DT05U Uk9MUykgYW5kIHVzZSBpdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTQzNTU5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBsb2FkZXIvQ29udGVudEZpbHRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpD b250ZW50RmlsdGVyOjp0eXBlcyk6IE9ubHkgcmVnaXN0ZXJlZCBQYXJlbnRhbENvbnRyb2xzQ29u dGVudEZpbHRlciBpZiBIQVZFKFBBUkVOVEFMX0NPTlRST0xTKS4KKyAgICAgICAgKiBwbGF0Zm9y bS9Db250ZW50RmlsdGVyVW5ibG9ja0hhbmRsZXIuaDogQ2hhbmdlZCBQTEFURk9STShJT1MpIHRv IEhBVkUoUEFSRU5UQUxfQ09OVFJPTFMpLgorICAgICAgICAqIHBsYXRmb3JtL2NvY29hL0NvbnRl bnRGaWx0ZXJVbmJsb2NrSGFuZGxlckNvY29hLm1tOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVu dEZpbHRlclVuYmxvY2tIYW5kbGVyOjp3cmFwV2l0aERlY2lzaW9uSGFuZGxlcik6IERpdHRvLgor ICAgICAgICAoV2ViQ29yZTo6Q29udGVudEZpbHRlclVuYmxvY2tIYW5kbGVyOjpuZWVkc1VJUHJv Y2Vzcyk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudEZpbHRlclVuYmxvY2tIYW5k bGVyOjplbmNvZGUpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRGaWx0ZXJVbmJs b2NrSGFuZGxlcjo6ZGVjb2RlKTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpDb250ZW50Rmls dGVyVW5ibG9ja0hhbmRsZXI6OmNhbkhhbmRsZVJlcXVlc3QpOiBEaXR0by4KKyAgICAgICAgKFdl YkNvcmU6OkNvbnRlbnRGaWx0ZXJVbmJsb2NrSGFuZGxlcjo6cmVxdWVzdFVuYmxvY2tBc3luYyk6 IERpdHRvLgorICAgICAgICAqIHBsYXRmb3JtL2NvY29hL1BhcmVudGFsQ29udHJvbHNDb250ZW50 RmlsdGVyLmg6IERlZmluZWQgSEFWRShQQVJFTlRBTF9DT05UUk9MUykgdG8gYmUgdHJ1ZSBvbiBh bGwgQ29jb2EgcGxhdGZvcm1zIGV4Y2VwdCBXYXRjaCBPUy4KKyAgICAgICAgKiBwbGF0Zm9ybS9j b2NvYS9QYXJlbnRhbENvbnRyb2xzQ29udGVudEZpbHRlci5tbTogV3JhcHBlZCB0aGUgZmlsZSB3 aXRoIEhBVkUoUEFSRU5UQUxfQ09OVFJPTFMpCisKIDIwMTUtMDQtMDggIFNpbW9uIEZyYXNlciAg PHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIGEgZGVidWcgYXNzZXJ0aW9u IHRoYXQgd2lsbCBmaXJlIGlmIHdlIHRyeSB0byBwYWludCBsYXllciBjb250ZW50cyBvbiBhIGJh Y2tncm91bmQgdGhyZWFkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybS5oIGIv U291cmNlL1dURi93dGYvUGxhdGZvcm0uaAppbmRleCA0ZjY1MDNlM2ZkNDliOTc3OGI4M2Q4MTdj M2JjNDUzOGIzOTZiMzZmLi41ZmQ3OWRiZDRkMjJiN2I2N2E4Y2ZmZDNmYzQyMWUyOTZhMTkxNTk2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybS5oCisrKyBiL1NvdXJjZS9XVEYv d3RmL1BsYXRmb3JtLmgKQEAgLTQ2NCw2ICs0NjQsMTEgQEAKICNkZWZpbmUgV1RGX1BMQVRGT1JN X0FQUExFVFYgMQogI2VuZGlmCiAKKy8qIFBMQVRGT1JNKFdBVENIT1MpICovCisjaWYgZGVmaW5l ZChUQVJHRVRfT1NfV0FUQ0gpICYmIFRBUkdFVF9PU19XQVRDSAorI2RlZmluZSBXVEZfUExBVEZP Uk1fV0FUQ0hPUyAxCisjZW5kaWYKKwogLyogR3JhcGhpY3MgZW5naW5lcyAqLwogCiAvKiBVU0Uo Q0cpIGFuZCBQTEFURk9STShDSSkgKi8KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9Db250ZW50RmlsdGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Db250ZW50RmlsdGVy LmNwcAppbmRleCA2ZDhlODhlNWZkNzY1ODkwYWFjMzY0YTJiYjU5YzRiMDViZThiNDE0Li4zMmE4 NzNlMGQ0MDE3YWEzZjRlYWViNDg3YjEyNzc0OWQyOGQ0ZTBlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvQ29udGVudEZpbHRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9h ZGVyL0NvbnRlbnRGaWx0ZXIuY3BwCkBAIC00Nyw3ICs0Nyw5IEBAIFZlY3RvcjxDb250ZW50Rmls dGVyOjpUeXBlPiYgQ29udGVudEZpbHRlcjo6dHlwZXMoKQogewogICAgIHN0YXRpYyBOZXZlckRl c3Ryb3llZDxWZWN0b3I8Q29udGVudEZpbHRlcjo6VHlwZT4+IHR5cGVzIHsKICAgICAgICAgVmVj dG9yPENvbnRlbnRGaWx0ZXI6OlR5cGU+IHsKKyNpZiBIQVZFKFBBUkVOVEFMX0NPTlRST0xTKQog ICAgICAgICAgICAgdHlwZTxQYXJlbnRhbENvbnRyb2xzQ29udGVudEZpbHRlcj4oKSwKKyNlbmRp ZgogI2lmIEhBVkUoTkVUV09SS19FWFRFTlNJT04pCiAgICAgICAgICAgICB0eXBlPE5ldHdvcmtF eHRlbnNpb25Db250ZW50RmlsdGVyPigpCiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL0NvbnRlbnRGaWx0ZXJVbmJsb2NrSGFuZGxlci5oIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vQ29udGVudEZpbHRlclVuYmxvY2tIYW5kbGVyLmgKaW5kZXggN2QwNDRjY2Mz ZTNhZDdmYjNiZDdjMjVkNmFmNGZiOWQ0NDg4M2Y5Ny4uMTMwNDMwYjY4ZDUwNTExZjBmYTU4MjJl Zjg4Njc1NjJkNmZkYjAxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vQ29u dGVudEZpbHRlclVuYmxvY2tIYW5kbGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Q29udGVudEZpbHRlclVuYmxvY2tIYW5kbGVyLmgKQEAgLTM2LDcgKzM2LDcgQEAKIE9CSkNfQ0xB U1MgTlNDb2RlcjsKIAogI2lmIFBMQVRGT1JNKElPUykKLU9CSkNfQ0xBU1MgV2ViRmlsdGVyRXZh bHVhdG9yOworI2ltcG9ydCAiUGFyZW50YWxDb250cm9sc0NvbnRlbnRGaWx0ZXIuaCIKICNlbmRp ZgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC01MCw3ICs1MCw3IEBAIHB1YmxpYzoKIAogICAg IENvbnRlbnRGaWx0ZXJVbmJsb2NrSGFuZGxlcigpID0gZGVmYXVsdDsKICAgICBXRUJDT1JFX0VY UE9SVCBDb250ZW50RmlsdGVyVW5ibG9ja0hhbmRsZXIoU3RyaW5nIHVuYmxvY2tVUkxIb3N0LCBV bmJsb2NrUmVxdWVzdGVyRnVuY3Rpb24pOwotI2lmIFBMQVRGT1JNKElPUykKKyNpZiBIQVZFKFBB UkVOVEFMX0NPTlRST0xTKQogICAgIENvbnRlbnRGaWx0ZXJVbmJsb2NrSGFuZGxlcihTdHJpbmcg dW5ibG9ja1VSTEhvc3QsIFJldGFpblB0cjxXZWJGaWx0ZXJFdmFsdWF0b3I+KTsKICNlbmRpZgog CkBAIC02OSw3ICs2OSw3IEBAIHByaXZhdGU6CiAgICAgU3RyaW5nIG1fdW5ibG9ja1VSTEhvc3Q7 CiAgICAgVVJMIG1fdW5yZWFjaGFibGVVUkw7CiAgICAgVW5ibG9ja1JlcXVlc3RlckZ1bmN0aW9u IG1fdW5ibG9ja1JlcXVlc3RlcjsKLSNpZiBQTEFURk9STShJT1MpCisjaWYgSEFWRShQQVJFTlRB TF9DT05UUk9MUykKICAgICBSZXRhaW5QdHI8V2ViRmlsdGVyRXZhbHVhdG9yPiBtX3dlYkZpbHRl ckV2YWx1YXRvcjsKICNlbmRpZgogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2NvY29hL0NvbnRlbnRGaWx0ZXJVbmJsb2NrSGFuZGxlckNvY29hLm1tIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vY29jb2EvQ29udGVudEZpbHRlclVuYmxvY2tIYW5kbGVyQ29jb2EubW0K aW5kZXggZTFjYTEzN2FlMWQzZWExOGIyYmNjODQ3NDMxZTk2OTk5MjIyM2M5Mi4uM2I2N2U0ZGM4 ZDgzNmM4YTRjODAyYzIyYjlhOWMxNjc5ODM3OGZiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vY29jb2EvQ29udGVudEZpbHRlclVuYmxvY2tIYW5kbGVyQ29jb2EubW0KKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY29jb2EvQ29udGVudEZpbHRlclVuYmxvY2tIYW5k bGVyQ29jb2EubW0KQEAgLTM4LDggKzM4LDExIEBACiAjZW5kaWYKIAogI2lmIFBMQVRGT1JNKElP UykKLSNpbXBvcnQgIlNvZnRMaW5raW5nLmgiCiAjaW1wb3J0ICJXZWJDb3JlVGhyZWFkUnVuLmgi CisjZW5kaWYKKworI2lmIEhBVkUoUEFSRU5UQUxfQ09OVFJPTFMpCisjaW1wb3J0ICJTb2Z0TGlu a2luZy5oIgogI2ltcG9ydCAiV2ViRmlsdGVyRXZhbHVhdG9yU1BJLmgiCiAKIFNPRlRfTElOS19Q UklWQVRFX0ZSQU1FV09SSyhXZWJDb250ZW50QW5hbHlzaXMpOwpAQCAtNjAsNyArNjMsNyBAQCBD b250ZW50RmlsdGVyVW5ibG9ja0hhbmRsZXI6OkNvbnRlbnRGaWx0ZXJVbmJsb2NrSGFuZGxlcihT dHJpbmcgdW5ibG9ja1VSTEhvc3QsCiAgICAgTE9HKENvbnRlbnRGaWx0ZXJpbmcsICJDcmVhdGlu ZyBDb250ZW50RmlsdGVyVW5ibG9ja0hhbmRsZXIgd2l0aCBhbiB1bmJsb2NrIHJlcXVlc3RlciBh bmQgdW5ibG9jayBVUkwgaG9zdCA8JXM+LlxuIiwgdW5ibG9ja1VSTEhvc3QuYXNjaWkoKS5kYXRh KCkpOwogfQogCi0jaWYgUExBVEZPUk0oSU9TKQorI2lmIEhBVkUoUEFSRU5UQUxfQ09OVFJPTFMp CiBDb250ZW50RmlsdGVyVW5ibG9ja0hhbmRsZXI6OkNvbnRlbnRGaWx0ZXJVbmJsb2NrSGFuZGxl cihTdHJpbmcgdW5ibG9ja1VSTEhvc3QsIFJldGFpblB0cjxXZWJGaWx0ZXJFdmFsdWF0b3I+IGV2 YWx1YXRvcikKICAgICA6IG1fdW5ibG9ja1VSTEhvc3QgeyBXVEY6Om1vdmUodW5ibG9ja1VSTEhv c3QpIH0KICAgICAsIG1fd2ViRmlsdGVyRXZhbHVhdG9yIHsgV1RGOjptb3ZlKGV2YWx1YXRvcikg fQpAQCAtNzgsNyArODEsNyBAQCB2b2lkIENvbnRlbnRGaWx0ZXJVbmJsb2NrSGFuZGxlcjo6d3Jh cFdpdGhEZWNpc2lvbkhhbmRsZXIoY29uc3QgRGVjaXNpb25IYW5kbGVyRgogICAgICAgICAgICAg ZGVjaXNpb25IYW5kbGVyKHVuYmxvY2tlZCk7CiAgICAgICAgIH0pOwogICAgIH19OwotI2lmIFBM QVRGT1JNKElPUykKKyNpZiBIQVZFKFBBUkVOVEFMX0NPTlRST0xTKQogICAgIG1fd2ViRmlsdGVy RXZhbHVhdG9yID0gbnVsbHB0cjsKICNlbmRpZgogICAgIHN0ZDo6c3dhcChtX3VuYmxvY2tSZXF1 ZXN0ZXIsIHdyYXBwZWRSZXF1ZXN0ZXIpOwpAQCAtODYsNyArODksNyBAQCB2b2lkIENvbnRlbnRG aWx0ZXJVbmJsb2NrSGFuZGxlcjo6d3JhcFdpdGhEZWNpc2lvbkhhbmRsZXIoY29uc3QgRGVjaXNp b25IYW5kbGVyRgogCiBib29sIENvbnRlbnRGaWx0ZXJVbmJsb2NrSGFuZGxlcjo6bmVlZHNVSVBy b2Nlc3MoKSBjb25zdAogewotI2lmIFBMQVRGT1JNKElPUykKKyNpZiBIQVZFKFBBUkVOVEFMX0NP TlRST0xTKQogICAgIHJldHVybiBtX3dlYkZpbHRlckV2YWx1YXRvcjsKICNlbHNlCiAgICAgcmV0 dXJuIGZhbHNlOwpAQCAtOTksNyArMTAyLDcgQEAgdm9pZCBDb250ZW50RmlsdGVyVW5ibG9ja0hh bmRsZXI6OmVuY29kZShOU0NvZGVyICpjb2RlcikgY29uc3QKICAgICBCRUdJTl9CTE9DS19PQkpD X0VYQ0VQVElPTlM7CiAgICAgW2NvZGVyIGVuY29kZU9iamVjdDptX3VuYmxvY2tVUkxIb3N0IGZv cktleTp1bmJsb2NrVVJMSG9zdEtleV07CiAgICAgW2NvZGVyIGVuY29kZU9iamVjdDooTlNVUkwg KiltX3VucmVhY2hhYmxlVVJMIGZvcktleTp1bnJlYWNoYWJsZVVSTEtleV07Ci0jaWYgUExBVEZP Uk0oSU9TKQorI2lmIEhBVkUoUEFSRU5UQUxfQ09OVFJPTFMpCiAgICAgW2NvZGVyIGVuY29kZU9i amVjdDptX3dlYkZpbHRlckV2YWx1YXRvci5nZXQoKSBmb3JLZXk6d2ViRmlsdGVyRXZhbHVhdG9y S2V5XTsKICNlbmRpZgogICAgIEVORF9CTE9DS19PQkpDX0VYQ0VQVElPTlM7CkBAIC0xMTEsNyAr MTE0LDcgQEAgYm9vbCBDb250ZW50RmlsdGVyVW5ibG9ja0hhbmRsZXI6OmRlY29kZShOU0NvZGVy ICpjb2RlciwgQ29udGVudEZpbHRlclVuYmxvY2tIYW4KICAgICBCRUdJTl9CTE9DS19PQkpDX0VY Q0VQVElPTlM7CiAgICAgdW5ibG9ja0hhbmRsZXIubV91bmJsb2NrVVJMSG9zdCA9IFtjb2RlciBk ZWNvZGVPYmplY3RPZkNsYXNzOltOU1N0cmluZyBjbGFzc10gZm9yS2V5OnVuYmxvY2tVUkxIb3N0 S2V5XTsKICAgICB1bmJsb2NrSGFuZGxlci5tX3VucmVhY2hhYmxlVVJMID0gW2NvZGVyIGRlY29k ZU9iamVjdE9mQ2xhc3M6W05TVVJMIGNsYXNzXSBmb3JLZXk6dW5yZWFjaGFibGVVUkxLZXldOwot I2lmIFBMQVRGT1JNKElPUykKKyNpZiBIQVZFKFBBUkVOVEFMX0NPTlRST0xTKQogICAgIHVuYmxv Y2tIYW5kbGVyLm1fd2ViRmlsdGVyRXZhbHVhdG9yID0gW2NvZGVyIGRlY29kZU9iamVjdE9mQ2xh c3M6Z2V0V2ViRmlsdGVyRXZhbHVhdG9yQ2xhc3MoKSBmb3JLZXk6d2ViRmlsdGVyRXZhbHVhdG9y S2V5XTsKICNlbmRpZgogICAgIHJldHVybiB0cnVlOwpAQCAtMTIyLDcgKzEyNSw3IEBAIGJvb2wg Q29udGVudEZpbHRlclVuYmxvY2tIYW5kbGVyOjpkZWNvZGUoTlNDb2RlciAqY29kZXIsIENvbnRl bnRGaWx0ZXJVbmJsb2NrSGFuCiBib29sIENvbnRlbnRGaWx0ZXJVbmJsb2NrSGFuZGxlcjo6Y2Fu SGFuZGxlUmVxdWVzdChjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QpIGNvbnN0CiB7CiAg ICAgaWYgKCFtX3VuYmxvY2tSZXF1ZXN0ZXIpIHsKLSNpZiBQTEFURk9STShJT1MpCisjaWYgSEFW RShQQVJFTlRBTF9DT05UUk9MUykKICAgICAgICAgaWYgKCFtX3dlYkZpbHRlckV2YWx1YXRvcikK ICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICNlbHNlCkBAIC0xNTEsNyArMTU0LDcgQEAgc3Rh dGljIGlubGluZSB2b2lkIGRpc3BhdGNoVG9NYWluVGhyZWFkKHZvaWQgKF5ibG9jaykoKSkKIAog dm9pZCBDb250ZW50RmlsdGVyVW5ibG9ja0hhbmRsZXI6OnJlcXVlc3RVbmJsb2NrQXN5bmMoRGVj aXNpb25IYW5kbGVyRnVuY3Rpb24gZGVjaXNpb25IYW5kbGVyKSBjb25zdAogewotI2lmIFBMQVRG T1JNKElPUykKKyNpZiBIQVZFKFBBUkVOVEFMX0NPTlRST0xTKQogICAgIGlmIChtX3dlYkZpbHRl ckV2YWx1YXRvcikgewogICAgICAgICBbbV93ZWJGaWx0ZXJFdmFsdWF0b3IgdW5ibG9ja1dpdGhD b21wbGV0aW9uOltkZWNpc2lvbkhhbmRsZXJdKEJPT0wgdW5ibG9ja2VkLCBOU0Vycm9yICopIHsK ICAgICAgICAgICAgIGRpc3BhdGNoVG9NYWluVGhyZWFkKFtkZWNpc2lvbkhhbmRsZXIsIHVuYmxv Y2tlZF0gewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY29jb2EvUGFyZW50 YWxDb250cm9sc0NvbnRlbnRGaWx0ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29h L1BhcmVudGFsQ29udHJvbHNDb250ZW50RmlsdGVyLmgKaW5kZXggNTNkNzlhZDg2MTc4M2Y0N2Vm YjgyNzg4MTExYzQ2MWI2MjA2OGI1Zi4uM2U3OTM1ZmZmZGNiZDIwYTkzMTcxMDUyMzQ2MDgxZGZk YWFiNDRlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY29jb2EvUGFyZW50 YWxDb250cm9sc0NvbnRlbnRGaWx0ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9j b2NvYS9QYXJlbnRhbENvbnRyb2xzQ29udGVudEZpbHRlci5oCkBAIC0zMCw2ICszMCw4IEBACiAj aW5jbHVkZSA8d3RmL0NvbXBpbGVyLmg+CiAjaW5jbHVkZSA8d3RmL1JldGFpblB0ci5oPgogCisj ZGVmaW5lIEhBVkVfUEFSRU5UQUxfQ09OVFJPTFMgUExBVEZPUk0oQ09DT0EpICYmICFQTEFURk9S TShXQVRDSE9TKQorCiBPQkpDX0NMQVNTIE5TRGF0YTsKIE9CSkNfQ0xBU1MgV2ViRmlsdGVyRXZh bHVhdG9yOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9QYXJl bnRhbENvbnRyb2xzQ29udGVudEZpbHRlci5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nv Y29hL1BhcmVudGFsQ29udHJvbHNDb250ZW50RmlsdGVyLm1tCmluZGV4IGNkYzFmNTEzYjljMGFm MTU2MWQ1NDBiMGYxZTg5ZDc3ZTU1OWI5NTMuLmEzNmVhMWY1M2U1ZDhjYzYxZjFkMGEyOTM0OWRm NTI4Yzg4OTMwOTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL1Bh cmVudGFsQ29udHJvbHNDb250ZW50RmlsdGVyLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2NvY29hL1BhcmVudGFsQ29udHJvbHNDb250ZW50RmlsdGVyLm1tCkBAIC0yNiw2ICsyNiw4 IEBACiAjaW1wb3J0ICJjb25maWcuaCIKICNpbXBvcnQgIlBhcmVudGFsQ29udHJvbHNDb250ZW50 RmlsdGVyLmgiCiAKKyNpZiBIQVZFKFBBUkVOVEFMX0NPTlRST0xTKQorCiAjaW1wb3J0ICJDb250 ZW50RmlsdGVyVW5ibG9ja0hhbmRsZXIuaCIKICNpbXBvcnQgIkxvZ2dpbmcuaCIKICNpbXBvcnQg IlJlc291cmNlUmVzcG9uc2UuaCIKQEAgLTEyOSwzICsxMzEsNSBAQCB2b2lkIFBhcmVudGFsQ29u dHJvbHNDb250ZW50RmlsdGVyOjp1cGRhdGVGaWx0ZXJTdGF0ZSgpCiB9CiAKIH0gLy8gbmFtZXNw YWNlIFdlYkNvcmUKKworI2VuZGlmIC8vIEhBVkUoUEFSRU5UQUxfQ09OVFJPTFMpCg==