158873 2016-06-17 07:05:32 -0700 WebRTC: RTCIceCandidate init dictionary don't handle explicit null or undefined values correctly 2016-06-20 21:52:03 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 143211 1 adam.bergkvist webkit-unassigned alex commit-queue oldest_to_newest 1203304 0 adam.bergkvist 2016-06-17 07:05:32 -0700 For example new RTCIceCandidate({ candidate: "foo", sdpMid: null }) succeeds and sdpMid becomes the string "null". 1203305 1 281562 adam.bergkvist 2016-06-17 07:20:01 -0700 Created attachment 281562 Proposed patch 1203307 2 281562 eric.carlson 2016-06-17 07:23:07 -0700 Comment on attachment 281562 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=281562&action=review > Source/WebCore/ChangeLog:8 > + Prevent explicit null and undefined values to be converted to "null" and "undefined" strings. Nit: "values to be converted to" -> "values from being converted to" 1203326 3 281562 alex 2016-06-17 09:39:20 -0700 Comment on attachment 281562 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=281562&action=review > Source/WebCore/Modules/mediastream/RTCIceCandidate.cpp:59 > + if (dictionary.getWithUndefinedOrNullCheck("sdpMLineIndex", sdpMLineIndexString)) { > + if (!sdpMLineIndexString.isNull()) { I think you can join the 2 ifs in just one with an and condition. Also check if getWithUndefinedOrNullCheck returns false if undefined or null, maybe we do not need the second condition. 1203728 4 281642 adam.bergkvist 2016-06-20 02:59:46 -0700 Created attachment 281642 Updated patch 1203729 5 adam.bergkvist 2016-06-20 03:02:56 -0700 (In reply to comment #2) > Comment on attachment 281562 [details] > Proposed patch Thanks for the reviews > View in context: > https://bugs.webkit.org/attachment.cgi?id=281562&action=review > > > Source/WebCore/ChangeLog:8 > > + Prevent explicit null and undefined values to be converted to "null" and "undefined" strings. > > Nit: "values to be converted to" -> "values from being converted to" Fixed. (In reply to comment #3) > Comment on attachment 281562 [details] > Proposed patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=281562&action=review > > > Source/WebCore/Modules/mediastream/RTCIceCandidate.cpp:59 > > + if (dictionary.getWithUndefinedOrNullCheck("sdpMLineIndex", sdpMLineIndexString)) { > > + if (!sdpMLineIndexString.isNull()) { > > I think you can join the 2 ifs in just one with an and condition. Also check > if getWithUndefinedOrNullCheck returns false if undefined or null, maybe we > do not need the second condition. Dug a bit deeper and getWithUndefinedOrNullCheck() returns false if the dictionary member was undefined or false; rendering the second check is unnecessary. Fixed. 1203733 6 281642 alex 2016-06-20 04:52:37 -0700 Comment on attachment 281642 Updated patch LGTM, required to handle the null values correctly for this nullable attributes. 1203737 7 281642 adam.bergkvist 2016-06-20 05:22:01 -0700 Comment on attachment 281642 Updated patch Thanks Alex and Eric! 1203740 8 281642 commit-queue 2016-06-20 05:43:10 -0700 Comment on attachment 281642 Updated patch Rejecting attachment 281642 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-01', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 281642, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: LayoutTests :040000 040000 53d9c5daad840e7c8d4b08e899f964d25323f0c8 f3f1d4fa1265a983a518943e7e3a0f794477e6bd M Source Current branch master is up to date. ERROR: Not all changes have been committed into SVN, however the committed ones (if any) seem to be successfully integrated into the working tree. Please see the above messages for details. Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Updating OpenSource Current branch master is up to date. Full output: http://webkit-queues.webkit.org/results/1536289 1204040 9 281642 adam.bergkvist 2016-06-20 21:30:22 -0700 Comment on attachment 281642 Updated patch Let's try cq again (now that it's fixed) 1204042 10 281642 commit-queue 2016-06-20 21:51:59 -0700 Comment on attachment 281642 Updated patch Clearing flags on attachment: 281642 Committed r202267: <http://trac.webkit.org/changeset/202267> 1204043 11 commit-queue 2016-06-20 21:52:03 -0700 All reviewed patches have been landed. Closing bug. 281562 2016-06-17 07:20:01 -0700 2016-06-20 02:59:46 -0700 Proposed patch candidate-null_0.patch text/plain 7956 adam.bergkvist ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBmZGNmNTkxLi5jM2U4MTFhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTYtMDYt MTcgIEFkYW0gQmVyZ2t2aXN0ICA8YWRhbS5iZXJna3Zpc3RAZXJpY3Nzb24uY29tPgorCisgICAg ICAgIFdlYlJUQzogUlRDSWNlQ2FuZGlkYXRlIGluaXQgZGljdGlvbmFyeSBkb24ndCBoYW5kbGUg ZXhwbGljaXQgbnVsbCBvciB1bmRlZmluZWQgdmFsdWVzIGNvcnJlY3RseQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU4ODczCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBkYXRlZCB0ZXN0IHRvIHZlcmlm eSB0aGF0IGV4cGxpY2l0IG51bGwgYW5kIHVuZGVmaW5lZCB2YWx1ZXMsIHBhc3NlZCB0byB0aGUK KyAgICAgICAgUlRDSWNlQ2FuZGlkYXRlIGluaXQgZGljdGlvbmFyeSwgYXJlIGhhbmRsZWQgY29y cmVjdGx5LgorCisgICAgICAgICogZmFzdC9tZWRpYXN0cmVhbS9SVENJY2VDYW5kaWRhdGUtZXhw ZWN0ZWQudHh0OgorICAgICAgICAqIGZhc3QvbWVkaWFzdHJlYW0vUlRDSWNlQ2FuZGlkYXRlLmh0 bWw6CisKIDIwMTYtMDYtMTQgIFJ5YW4gSGFkZGFkICA8cnlhbmhhZGRhZEBhcHBsZS5jb20+CiAK ICAgICAgICAgSW5jcmVhc2UgdGltZW91dHMgZm9yIHVzZXJzY3JpcHRzL3dpbmRvdy1vbmVycm9y LWZvci1pc29sYXRlZC13b3JsZC0zLmh0bWwgdG8gZml4IGZsYWtpbmVzcy4KZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2Zhc3QvbWVkaWFzdHJlYW0vUlRDSWNlQ2FuZGlkYXRlLWV4cGVjdGVkLnR4 dCBiL0xheW91dFRlc3RzL2Zhc3QvbWVkaWFzdHJlYW0vUlRDSWNlQ2FuZGlkYXRlLWV4cGVjdGVk LnR4dAppbmRleCBlOWVkYjhkLi4zYzkwMjk4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0 L21lZGlhc3RyZWFtL1JUQ0ljZUNhbmRpZGF0ZS1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVz dHMvZmFzdC9tZWRpYXN0cmVhbS9SVENJY2VDYW5kaWRhdGUtZXhwZWN0ZWQudHh0CkBAIC0yNCw4 ICsyNCwyOCBAQCBQQVNTIG5ldyBSVENJY2VDYW5kaWRhdGUoe3NkcE1pZDoiYmFyIiwgc2RwTUxp bmVJbmRleDo2fSk7IHRocmV3IGV4Y2VwdGlvbiBUeXBlRQogUEFTUyBuZXcgUlRDSWNlQ2FuZGlk YXRlKHtzZHBNaWQ6ImJhciJ9KTsgdGhyZXcgZXhjZXB0aW9uIFR5cGVFcnJvcjogVHlwZSBlcnJv ci4KIFBBU1MgbmV3IFJUQ0ljZUNhbmRpZGF0ZSh7c2RwTUxpbmVJbmRleDo2fSk7IHRocmV3IGV4 Y2VwdGlvbiBUeXBlRXJyb3I6IFR5cGUgZXJyb3IuCiAKLU9uZSBvZiB0aGUgJ3NkcE1pZCcgb3Ig J3NkcE1MaW5lSW5kZXgnIG1lbWJlcnMgbXVzdCBiZSBwcmVzZW50LgorT25lIG9mIHRoZSAnc2Rw TWlkJyBvciAnc2RwTUxpbmVJbmRleCcgbWVtYmVycyBtdXN0IGJlIHByZXNlbnQgKGFuZCBub3Qg bnVsbCBvciB1bmRlZmluZWQpLgogUEFTUyBuZXcgUlRDSWNlQ2FuZGlkYXRlKHtjYW5kaWRhdGU6 ImZvbyJ9KTsgdGhyZXcgZXhjZXB0aW9uIFR5cGVFcnJvcjogVHlwZSBlcnJvci4KK1BBU1MgbmV3 IFJUQ0ljZUNhbmRpZGF0ZSh7Y2FuZGlkYXRlOiJmb28iLCBzZHBNaWQ6IG51bGx9KTsgdGhyZXcg ZXhjZXB0aW9uIFR5cGVFcnJvcjogVHlwZSBlcnJvci4KK1BBU1MgbmV3IFJUQ0ljZUNhbmRpZGF0 ZSh7Y2FuZGlkYXRlOiJmb28iLCBzZHBNaWQ6IHVuZGVmaW5lZH0pOyB0aHJldyBleGNlcHRpb24g VHlwZUVycm9yOiBUeXBlIGVycm9yLgorUEFTUyBuZXcgUlRDSWNlQ2FuZGlkYXRlKHtjYW5kaWRh dGU6ImZvbyIsIHNkcE1MaW5lSW5kZXg6IG51bGx9KTsgdGhyZXcgZXhjZXB0aW9uIFR5cGVFcnJv cjogVHlwZSBlcnJvci4KK1BBU1MgbmV3IFJUQ0ljZUNhbmRpZGF0ZSh7Y2FuZGlkYXRlOiJmb28i LCBzZHBNTGluZUluZGV4OiB1bmRlZmluZWR9KTsgdGhyZXcgZXhjZXB0aW9uIFR5cGVFcnJvcjog VHlwZSBlcnJvci4KK1BBU1MgbmV3IFJUQ0ljZUNhbmRpZGF0ZSh7Y2FuZGlkYXRlOiJmb28iLCBz ZHBNaWQ6IG51bGwsIHNkcE1MaW5lSW5kZXg6IG51bGx9KTsgdGhyZXcgZXhjZXB0aW9uIFR5cGVF cnJvcjogVHlwZSBlcnJvci4KK1BBU1MgbmV3IFJUQ0ljZUNhbmRpZGF0ZSh7Y2FuZGlkYXRlOiJm b28iLCBzZHBNaWQ6IHVuZGVmaW5lZCwgc2RwTUxpbmVJbmRleDogdW5kZWZpbmVkfSk7IHRocmV3 IGV4Y2VwdGlvbiBUeXBlRXJyb3I6IFR5cGUgZXJyb3IuCisKK1Rlc3QgdGhhdCBzZHBNaWQgb3Ig c2RwTUxpbmVJbmRleCBleHBsaWNpdGx5IHNldCB0byBudWxsIG9yIHVuZGVmaW5lZCwgcmVzdWx0 cyBpbiBhIG51bGwgdmFsdWUuCitQQVNTIGNhbmRpZGF0ZSA9IG5ldyBSVENJY2VDYW5kaWRhdGUo e2NhbmRpZGF0ZToiZm9vIiwgc2RwTWlkOiBudWxsLCBzZHBNTGluZUluZGV4OiAxfSk7IGRpZCBu b3QgdGhyb3cgZXhjZXB0aW9uLgorUEFTUyBjYW5kaWRhdGUuc2RwTWlkIGlzIG51bGwKK1BBU1Mg Y2FuZGlkYXRlLnNkcE1MaW5lSW5kZXggaXMgMQorUEFTUyBjYW5kaWRhdGUgPSBuZXcgUlRDSWNl Q2FuZGlkYXRlKHtjYW5kaWRhdGU6ImZvbyIsIHNkcE1pZDogdW5kZWZpbmVkLCBzZHBNTGluZUlu ZGV4OiAxfSk7IGRpZCBub3QgdGhyb3cgZXhjZXB0aW9uLgorUEFTUyBjYW5kaWRhdGUuc2RwTWlk IGlzIG51bGwKK1BBU1MgY2FuZGlkYXRlLnNkcE1MaW5lSW5kZXggaXMgMQorUEFTUyBjYW5kaWRh dGUgPSBuZXcgUlRDSWNlQ2FuZGlkYXRlKHtjYW5kaWRhdGU6ImZvbyIsIHNkcE1pZDogImZvbyIs IHNkcE1MaW5lSW5kZXg6IG51bGx9KTsgZGlkIG5vdCB0aHJvdyBleGNlcHRpb24uCitQQVNTIGNh bmRpZGF0ZS5zZHBNaWQgaXMgJ2ZvbycKK1BBU1MgY2FuZGlkYXRlLnNkcE1MaW5lSW5kZXggaXMg bnVsbAorUEFTUyBjYW5kaWRhdGUgPSBuZXcgUlRDSWNlQ2FuZGlkYXRlKHtjYW5kaWRhdGU6ImZv byIsIHNkcE1pZDogImZvbyIsIHNkcE1MaW5lSW5kZXg6IHVuZGVmaW5lZH0pOyBkaWQgbm90IHRo cm93IGV4Y2VwdGlvbi4KK1BBU1MgY2FuZGlkYXRlLnNkcE1pZCBpcyAnZm9vJworUEFTUyBjYW5k aWRhdGUuc2RwTUxpbmVJbmRleCBpcyBudWxsCiAKIFdoZW4gb25lIG9mIHRoZSAnc2RwTWlkJyBv ciAnc2RwTUxpbmVJbmRleCcgbWVtYmVycyBpcyBzZXQsIHRoZSBvdGhlciBtdXN0IGJlIG51bGwu CiBQQVNTIGNhbmRpZGF0ZSA9IG5ldyBSVENJY2VDYW5kaWRhdGUoe2NhbmRpZGF0ZToiZm9vIiwg c2RwTWlkOiJiYXIifSk7IGRpZCBub3QgdGhyb3cgZXhjZXB0aW9uLgpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9SVENJY2VDYW5kaWRhdGUuaHRtbCBiL0xheW91dFRl c3RzL2Zhc3QvbWVkaWFzdHJlYW0vUlRDSWNlQ2FuZGlkYXRlLmh0bWwKaW5kZXggYmNkOTliMC4u YzQwMzE1NiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9SVENJY2VD YW5kaWRhdGUuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L21lZGlhc3RyZWFtL1JUQ0ljZUNh bmRpZGF0ZS5odG1sCkBAIC0zNCw4ICszNCwzMiBAQAogICAgICAgICAgICAgc2hvdWxkVGhyb3co J25ldyBSVENJY2VDYW5kaWRhdGUoe3NkcE1MaW5lSW5kZXg6Nn0pOycpOwogICAgICAgICAgICAg ZGVidWcoIiIpOwogCi0gICAgICAgICAgICBkZWJ1ZygiT25lIG9mIHRoZSAnc2RwTWlkJyBvciAn c2RwTUxpbmVJbmRleCcgbWVtYmVycyBtdXN0IGJlIHByZXNlbnQuIik7CisgICAgICAgICAgICBk ZWJ1ZygiT25lIG9mIHRoZSAnc2RwTWlkJyBvciAnc2RwTUxpbmVJbmRleCcgbWVtYmVycyBtdXN0 IGJlIHByZXNlbnQgKGFuZCBub3QgbnVsbCBvciB1bmRlZmluZWQpLiIpOwogICAgICAgICAgICAg c2hvdWxkVGhyb3coJ25ldyBSVENJY2VDYW5kaWRhdGUoe2NhbmRpZGF0ZToiZm9vIn0pOycpOwor ICAgICAgICAgICAgc2hvdWxkVGhyb3coJ25ldyBSVENJY2VDYW5kaWRhdGUoe2NhbmRpZGF0ZToi Zm9vIiwgc2RwTWlkOiBudWxsfSk7Jyk7CisgICAgICAgICAgICBzaG91bGRUaHJvdygnbmV3IFJU Q0ljZUNhbmRpZGF0ZSh7Y2FuZGlkYXRlOiJmb28iLCBzZHBNaWQ6IHVuZGVmaW5lZH0pOycpOwor ICAgICAgICAgICAgc2hvdWxkVGhyb3coJ25ldyBSVENJY2VDYW5kaWRhdGUoe2NhbmRpZGF0ZToi Zm9vIiwgc2RwTUxpbmVJbmRleDogbnVsbH0pOycpOworICAgICAgICAgICAgc2hvdWxkVGhyb3co J25ldyBSVENJY2VDYW5kaWRhdGUoe2NhbmRpZGF0ZToiZm9vIiwgc2RwTUxpbmVJbmRleDogdW5k ZWZpbmVkfSk7Jyk7CisgICAgICAgICAgICBzaG91bGRUaHJvdygnbmV3IFJUQ0ljZUNhbmRpZGF0 ZSh7Y2FuZGlkYXRlOiJmb28iLCBzZHBNaWQ6IG51bGwsIHNkcE1MaW5lSW5kZXg6IG51bGx9KTsn KTsKKyAgICAgICAgICAgIHNob3VsZFRocm93KCduZXcgUlRDSWNlQ2FuZGlkYXRlKHtjYW5kaWRh dGU6ImZvbyIsIHNkcE1pZDogdW5kZWZpbmVkLCBzZHBNTGluZUluZGV4OiB1bmRlZmluZWR9KTsn KTsKKyAgICAgICAgICAgIGRlYnVnKCIiKTsKKworICAgICAgICAgICAgZGVidWcoIlRlc3QgdGhh dCBzZHBNaWQgb3Igc2RwTUxpbmVJbmRleCBleHBsaWNpdGx5IHNldCB0byBudWxsIG9yIHVuZGVm aW5lZCwgcmVzdWx0cyBpbiBhIG51bGwgdmFsdWUuIik7CisgICAgICAgICAgICBzaG91bGROb3RU aHJvdygnY2FuZGlkYXRlID0gbmV3IFJUQ0ljZUNhbmRpZGF0ZSh7Y2FuZGlkYXRlOiJmb28iLCBz ZHBNaWQ6IG51bGwsIHNkcE1MaW5lSW5kZXg6IDF9KTsnKTsKKyAgICAgICAgICAgIHNob3VsZEJl TnVsbCgiY2FuZGlkYXRlLnNkcE1pZCIpOworICAgICAgICAgICAgc2hvdWxkQmUoImNhbmRpZGF0 ZS5zZHBNTGluZUluZGV4IiwgIjEiKTsKKworICAgICAgICAgICAgc2hvdWxkTm90VGhyb3coJ2Nh bmRpZGF0ZSA9IG5ldyBSVENJY2VDYW5kaWRhdGUoe2NhbmRpZGF0ZToiZm9vIiwgc2RwTWlkOiB1 bmRlZmluZWQsIHNkcE1MaW5lSW5kZXg6IDF9KTsnKTsKKyAgICAgICAgICAgIHNob3VsZEJlTnVs bCgiY2FuZGlkYXRlLnNkcE1pZCIpOworICAgICAgICAgICAgc2hvdWxkQmUoImNhbmRpZGF0ZS5z ZHBNTGluZUluZGV4IiwgIjEiKTsKKworICAgICAgICAgICAgc2hvdWxkTm90VGhyb3coJ2NhbmRp ZGF0ZSA9IG5ldyBSVENJY2VDYW5kaWRhdGUoe2NhbmRpZGF0ZToiZm9vIiwgc2RwTWlkOiAiZm9v Iiwgc2RwTUxpbmVJbmRleDogbnVsbH0pOycpOworICAgICAgICAgICAgc2hvdWxkQmUoImNhbmRp ZGF0ZS5zZHBNaWQiLCAiJ2ZvbyciKTsKKyAgICAgICAgICAgIHNob3VsZEJlTnVsbCgiY2FuZGlk YXRlLnNkcE1MaW5lSW5kZXgiKTsKKworICAgICAgICAgICAgc2hvdWxkTm90VGhyb3coJ2NhbmRp ZGF0ZSA9IG5ldyBSVENJY2VDYW5kaWRhdGUoe2NhbmRpZGF0ZToiZm9vIiwgc2RwTWlkOiAiZm9v Iiwgc2RwTUxpbmVJbmRleDogdW5kZWZpbmVkfSk7Jyk7CisgICAgICAgICAgICBzaG91bGRCZSgi Y2FuZGlkYXRlLnNkcE1pZCIsICInZm9vJyIpOworICAgICAgICAgICAgc2hvdWxkQmVOdWxsKCJj YW5kaWRhdGUuc2RwTUxpbmVJbmRleCIpOwogICAgICAgICAgICAgZGVidWcoIiIpOwogCiAgICAg ICAgICAgICBkZWJ1ZygiV2hlbiBvbmUgb2YgdGhlICdzZHBNaWQnIG9yICdzZHBNTGluZUluZGV4 JyBtZW1iZXJzIGlzIHNldCwgdGhlIG90aGVyIG11c3QgYmUgbnVsbC4iKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRl eCA1NzcxMTRhLi44N2I1YTQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTYtMDYt MTcgIEFkYW0gQmVyZ2t2aXN0ICA8YWRhbS5iZXJna3Zpc3RAZXJpY3Nzb24uY29tPgorCisgICAg ICAgIFdlYlJUQzogUlRDSWNlQ2FuZGlkYXRlIGluaXQgZGljdGlvbmFyeSBkb24ndCBoYW5kbGUg ZXhwbGljaXQgbnVsbCBvciB1bmRlZmluZWQgdmFsdWVzIGNvcnJlY3RseQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU4ODczCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUHJldmVudCBleHBsaWNpdCBudWxs IGFuZCB1bmRlZmluZWQgdmFsdWVzIHRvIGJlIGNvbnZlcnRlZCB0byAibnVsbCIgYW5kICJ1bmRl ZmluZWQiIHN0cmluZ3MuCisKKyAgICAgICAgVGVzdDogRXh0ZW5kZWQgZmFzdC9tZWRpYXN0cmVh bS9SVENJY2VDYW5kaWRhdGUuaHRtbAorCisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9S VENJY2VDYW5kaWRhdGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UlRDSWNlQ2FuZGlkYXRlOjpj cmVhdGUpOgorCiAyMDE2LTA2LTE0ICBDb21taXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0 Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMjAyMDU3LgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENJY2VDYW5kaWRhdGUu Y3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENJY2VDYW5kaWRhdGUu Y3BwCmluZGV4IGY1MDk1NmEuLmYxN2Y5Y2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvbWVkaWFzdHJlYW0vUlRDSWNlQ2FuZGlkYXRlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ0ljZUNhbmRpZGF0ZS5jcHAKQEAgLTUwLDE5ICs1MCwy MSBAQCBSZWZQdHI8UlRDSWNlQ2FuZGlkYXRlPiBSVENJY2VDYW5kaWRhdGU6OmNyZWF0ZShjb25z dCBEaWN0aW9uYXJ5JiBkaWN0aW9uYXJ5LCBFeAogICAgIH0KIAogICAgIFN0cmluZyBzZHBNaWQ7 Ci0gICAgZGljdGlvbmFyeS5nZXQoInNkcE1pZCIsIHNkcE1pZCk7CisgICAgZGljdGlvbmFyeS5n ZXRXaXRoVW5kZWZpbmVkT3JOdWxsQ2hlY2soInNkcE1pZCIsIHNkcE1pZCk7CiAKICAgICBPcHRp b25hbDx1bnNpZ25lZCBzaG9ydD4gc2RwTUxpbmVJbmRleDsKICAgICBTdHJpbmcgc2RwTUxpbmVJ bmRleFN0cmluZzsKIAotICAgIGlmIChkaWN0aW9uYXJ5LmdldCgic2RwTUxpbmVJbmRleCIsIHNk cE1MaW5lSW5kZXhTdHJpbmcpKSB7Ci0gICAgICAgIGJvb2wgaW50Q29udmVyc2lvbk9rOwotICAg ICAgICB1bnNpZ25lZCByZXN1bHQgPSBzZHBNTGluZUluZGV4U3RyaW5nLnRvVUludFN0cmljdCgm aW50Q29udmVyc2lvbk9rKTsKLSAgICAgICAgaWYgKCFpbnRDb252ZXJzaW9uT2sgfHwgcmVzdWx0 ID4gVVNIUlRfTUFYKSB7Ci0gICAgICAgICAgICBlYyA9IFR5cGVFcnJvcjsKLSAgICAgICAgICAg IHJldHVybiBudWxscHRyOworICAgIGlmIChkaWN0aW9uYXJ5LmdldFdpdGhVbmRlZmluZWRPck51 bGxDaGVjaygic2RwTUxpbmVJbmRleCIsIHNkcE1MaW5lSW5kZXhTdHJpbmcpKSB7CisgICAgICAg IGlmICghc2RwTUxpbmVJbmRleFN0cmluZy5pc051bGwoKSkgeworICAgICAgICAgICAgYm9vbCBp bnRDb252ZXJzaW9uT2s7CisgICAgICAgICAgICB1bnNpZ25lZCByZXN1bHQgPSBzZHBNTGluZUlu ZGV4U3RyaW5nLnRvVUludFN0cmljdCgmaW50Q29udmVyc2lvbk9rKTsKKyAgICAgICAgICAgIGlm ICghaW50Q29udmVyc2lvbk9rIHx8IHJlc3VsdCA+IFVTSFJUX01BWCkgeworICAgICAgICAgICAg ICAgIGVjID0gVHlwZUVycm9yOworICAgICAgICAgICAgICAgIHJldHVybiBudWxscHRyOworICAg ICAgICAgICAgfQorICAgICAgICAgICAgc2RwTUxpbmVJbmRleCA9IHJlc3VsdDsKICAgICAgICAg fQotICAgICAgICBzZHBNTGluZUluZGV4ID0gcmVzdWx0OwogICAgIH0KIAogICAgIGlmIChzZHBN aWQuaXNOdWxsKCkgJiYgIXNkcE1MaW5lSW5kZXgpIHsK 281642 2016-06-20 02:59:46 -0700 2016-06-20 21:51:59 -0700 Updated patch candidate-null_1.patch text/plain 7454 adam.bergkvist ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA0OTFmMGU2Li44ZDIzMDFjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTYtMDYt MTcgIEFkYW0gQmVyZ2t2aXN0ICA8YWRhbS5iZXJna3Zpc3RAZXJpY3Nzb24uY29tPgorCisgICAg ICAgIFdlYlJUQzogUlRDSWNlQ2FuZGlkYXRlIGluaXQgZGljdGlvbmFyeSBkb24ndCBoYW5kbGUg ZXhwbGljaXQgbnVsbCBvciB1bmRlZmluZWQgdmFsdWVzIGNvcnJlY3RseQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU4ODczCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBkYXRlZCB0ZXN0IHRvIHZlcmlm eSB0aGF0IGV4cGxpY2l0IG51bGwgYW5kIHVuZGVmaW5lZCB2YWx1ZXMsIHBhc3NlZCB0byB0aGUK KyAgICAgICAgUlRDSWNlQ2FuZGlkYXRlIGluaXQgZGljdGlvbmFyeSwgYXJlIGhhbmRsZWQgY29y cmVjdGx5LgorCisgICAgICAgICogZmFzdC9tZWRpYXN0cmVhbS9SVENJY2VDYW5kaWRhdGUtZXhw ZWN0ZWQudHh0OgorICAgICAgICAqIGZhc3QvbWVkaWFzdHJlYW0vUlRDSWNlQ2FuZGlkYXRlLmh0 bWw6CisKIDIwMTYtMDYtMTcgIEJlbmphbWluIFBvdWxhaW4gIDxiZW5qYW1pbkB3ZWJraXQub3Jn PgogCiAgICAgICAgIDppbmRldGVybWluYXRlIHBzZXVkby1jbGFzcyBzaG91bGQgbWF0Y2ggcmFk aW9zIHdob3NlIGdyb3VwIGhhcyBubyBjaGVja2VkIHJhZGlvCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9mYXN0L21lZGlhc3RyZWFtL1JUQ0ljZUNhbmRpZGF0ZS1leHBlY3RlZC50eHQgYi9MYXlv dXRUZXN0cy9mYXN0L21lZGlhc3RyZWFtL1JUQ0ljZUNhbmRpZGF0ZS1leHBlY3RlZC50eHQKaW5k ZXggZTllZGI4ZC4uM2M5MDI5OCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0 cmVhbS9SVENJY2VDYW5kaWRhdGUtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2Zhc3Qv bWVkaWFzdHJlYW0vUlRDSWNlQ2FuZGlkYXRlLWV4cGVjdGVkLnR4dApAQCAtMjQsOCArMjQsMjgg QEAgUEFTUyBuZXcgUlRDSWNlQ2FuZGlkYXRlKHtzZHBNaWQ6ImJhciIsIHNkcE1MaW5lSW5kZXg6 Nn0pOyB0aHJldyBleGNlcHRpb24gVHlwZUUKIFBBU1MgbmV3IFJUQ0ljZUNhbmRpZGF0ZSh7c2Rw TWlkOiJiYXIifSk7IHRocmV3IGV4Y2VwdGlvbiBUeXBlRXJyb3I6IFR5cGUgZXJyb3IuCiBQQVNT IG5ldyBSVENJY2VDYW5kaWRhdGUoe3NkcE1MaW5lSW5kZXg6Nn0pOyB0aHJldyBleGNlcHRpb24g VHlwZUVycm9yOiBUeXBlIGVycm9yLgogCi1PbmUgb2YgdGhlICdzZHBNaWQnIG9yICdzZHBNTGlu ZUluZGV4JyBtZW1iZXJzIG11c3QgYmUgcHJlc2VudC4KK09uZSBvZiB0aGUgJ3NkcE1pZCcgb3Ig J3NkcE1MaW5lSW5kZXgnIG1lbWJlcnMgbXVzdCBiZSBwcmVzZW50IChhbmQgbm90IG51bGwgb3Ig dW5kZWZpbmVkKS4KIFBBU1MgbmV3IFJUQ0ljZUNhbmRpZGF0ZSh7Y2FuZGlkYXRlOiJmb28ifSk7 IHRocmV3IGV4Y2VwdGlvbiBUeXBlRXJyb3I6IFR5cGUgZXJyb3IuCitQQVNTIG5ldyBSVENJY2VD YW5kaWRhdGUoe2NhbmRpZGF0ZToiZm9vIiwgc2RwTWlkOiBudWxsfSk7IHRocmV3IGV4Y2VwdGlv biBUeXBlRXJyb3I6IFR5cGUgZXJyb3IuCitQQVNTIG5ldyBSVENJY2VDYW5kaWRhdGUoe2NhbmRp ZGF0ZToiZm9vIiwgc2RwTWlkOiB1bmRlZmluZWR9KTsgdGhyZXcgZXhjZXB0aW9uIFR5cGVFcnJv cjogVHlwZSBlcnJvci4KK1BBU1MgbmV3IFJUQ0ljZUNhbmRpZGF0ZSh7Y2FuZGlkYXRlOiJmb28i LCBzZHBNTGluZUluZGV4OiBudWxsfSk7IHRocmV3IGV4Y2VwdGlvbiBUeXBlRXJyb3I6IFR5cGUg ZXJyb3IuCitQQVNTIG5ldyBSVENJY2VDYW5kaWRhdGUoe2NhbmRpZGF0ZToiZm9vIiwgc2RwTUxp bmVJbmRleDogdW5kZWZpbmVkfSk7IHRocmV3IGV4Y2VwdGlvbiBUeXBlRXJyb3I6IFR5cGUgZXJy b3IuCitQQVNTIG5ldyBSVENJY2VDYW5kaWRhdGUoe2NhbmRpZGF0ZToiZm9vIiwgc2RwTWlkOiBu dWxsLCBzZHBNTGluZUluZGV4OiBudWxsfSk7IHRocmV3IGV4Y2VwdGlvbiBUeXBlRXJyb3I6IFR5 cGUgZXJyb3IuCitQQVNTIG5ldyBSVENJY2VDYW5kaWRhdGUoe2NhbmRpZGF0ZToiZm9vIiwgc2Rw TWlkOiB1bmRlZmluZWQsIHNkcE1MaW5lSW5kZXg6IHVuZGVmaW5lZH0pOyB0aHJldyBleGNlcHRp b24gVHlwZUVycm9yOiBUeXBlIGVycm9yLgorCitUZXN0IHRoYXQgc2RwTWlkIG9yIHNkcE1MaW5l SW5kZXggZXhwbGljaXRseSBzZXQgdG8gbnVsbCBvciB1bmRlZmluZWQsIHJlc3VsdHMgaW4gYSBu dWxsIHZhbHVlLgorUEFTUyBjYW5kaWRhdGUgPSBuZXcgUlRDSWNlQ2FuZGlkYXRlKHtjYW5kaWRh dGU6ImZvbyIsIHNkcE1pZDogbnVsbCwgc2RwTUxpbmVJbmRleDogMX0pOyBkaWQgbm90IHRocm93 IGV4Y2VwdGlvbi4KK1BBU1MgY2FuZGlkYXRlLnNkcE1pZCBpcyBudWxsCitQQVNTIGNhbmRpZGF0 ZS5zZHBNTGluZUluZGV4IGlzIDEKK1BBU1MgY2FuZGlkYXRlID0gbmV3IFJUQ0ljZUNhbmRpZGF0 ZSh7Y2FuZGlkYXRlOiJmb28iLCBzZHBNaWQ6IHVuZGVmaW5lZCwgc2RwTUxpbmVJbmRleDogMX0p OyBkaWQgbm90IHRocm93IGV4Y2VwdGlvbi4KK1BBU1MgY2FuZGlkYXRlLnNkcE1pZCBpcyBudWxs CitQQVNTIGNhbmRpZGF0ZS5zZHBNTGluZUluZGV4IGlzIDEKK1BBU1MgY2FuZGlkYXRlID0gbmV3 IFJUQ0ljZUNhbmRpZGF0ZSh7Y2FuZGlkYXRlOiJmb28iLCBzZHBNaWQ6ICJmb28iLCBzZHBNTGlu ZUluZGV4OiBudWxsfSk7IGRpZCBub3QgdGhyb3cgZXhjZXB0aW9uLgorUEFTUyBjYW5kaWRhdGUu c2RwTWlkIGlzICdmb28nCitQQVNTIGNhbmRpZGF0ZS5zZHBNTGluZUluZGV4IGlzIG51bGwKK1BB U1MgY2FuZGlkYXRlID0gbmV3IFJUQ0ljZUNhbmRpZGF0ZSh7Y2FuZGlkYXRlOiJmb28iLCBzZHBN aWQ6ICJmb28iLCBzZHBNTGluZUluZGV4OiB1bmRlZmluZWR9KTsgZGlkIG5vdCB0aHJvdyBleGNl cHRpb24uCitQQVNTIGNhbmRpZGF0ZS5zZHBNaWQgaXMgJ2ZvbycKK1BBU1MgY2FuZGlkYXRlLnNk cE1MaW5lSW5kZXggaXMgbnVsbAogCiBXaGVuIG9uZSBvZiB0aGUgJ3NkcE1pZCcgb3IgJ3NkcE1M aW5lSW5kZXgnIG1lbWJlcnMgaXMgc2V0LCB0aGUgb3RoZXIgbXVzdCBiZSBudWxsLgogUEFTUyBj YW5kaWRhdGUgPSBuZXcgUlRDSWNlQ2FuZGlkYXRlKHtjYW5kaWRhdGU6ImZvbyIsIHNkcE1pZDoi YmFyIn0pOyBkaWQgbm90IHRocm93IGV4Y2VwdGlvbi4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2Zhc3QvbWVkaWFzdHJlYW0vUlRDSWNlQ2FuZGlkYXRlLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0 L21lZGlhc3RyZWFtL1JUQ0ljZUNhbmRpZGF0ZS5odG1sCmluZGV4IGJjZDk5YjAuLmM0MDMxNTYg MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvbWVkaWFzdHJlYW0vUlRDSWNlQ2FuZGlkYXRl Lmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9SVENJY2VDYW5kaWRhdGUu aHRtbApAQCAtMzQsOCArMzQsMzIgQEAKICAgICAgICAgICAgIHNob3VsZFRocm93KCduZXcgUlRD SWNlQ2FuZGlkYXRlKHtzZHBNTGluZUluZGV4OjZ9KTsnKTsKICAgICAgICAgICAgIGRlYnVnKCIi KTsKIAotICAgICAgICAgICAgZGVidWcoIk9uZSBvZiB0aGUgJ3NkcE1pZCcgb3IgJ3NkcE1MaW5l SW5kZXgnIG1lbWJlcnMgbXVzdCBiZSBwcmVzZW50LiIpOworICAgICAgICAgICAgZGVidWcoIk9u ZSBvZiB0aGUgJ3NkcE1pZCcgb3IgJ3NkcE1MaW5lSW5kZXgnIG1lbWJlcnMgbXVzdCBiZSBwcmVz ZW50IChhbmQgbm90IG51bGwgb3IgdW5kZWZpbmVkKS4iKTsKICAgICAgICAgICAgIHNob3VsZFRo cm93KCduZXcgUlRDSWNlQ2FuZGlkYXRlKHtjYW5kaWRhdGU6ImZvbyJ9KTsnKTsKKyAgICAgICAg ICAgIHNob3VsZFRocm93KCduZXcgUlRDSWNlQ2FuZGlkYXRlKHtjYW5kaWRhdGU6ImZvbyIsIHNk cE1pZDogbnVsbH0pOycpOworICAgICAgICAgICAgc2hvdWxkVGhyb3coJ25ldyBSVENJY2VDYW5k aWRhdGUoe2NhbmRpZGF0ZToiZm9vIiwgc2RwTWlkOiB1bmRlZmluZWR9KTsnKTsKKyAgICAgICAg ICAgIHNob3VsZFRocm93KCduZXcgUlRDSWNlQ2FuZGlkYXRlKHtjYW5kaWRhdGU6ImZvbyIsIHNk cE1MaW5lSW5kZXg6IG51bGx9KTsnKTsKKyAgICAgICAgICAgIHNob3VsZFRocm93KCduZXcgUlRD SWNlQ2FuZGlkYXRlKHtjYW5kaWRhdGU6ImZvbyIsIHNkcE1MaW5lSW5kZXg6IHVuZGVmaW5lZH0p OycpOworICAgICAgICAgICAgc2hvdWxkVGhyb3coJ25ldyBSVENJY2VDYW5kaWRhdGUoe2NhbmRp ZGF0ZToiZm9vIiwgc2RwTWlkOiBudWxsLCBzZHBNTGluZUluZGV4OiBudWxsfSk7Jyk7CisgICAg ICAgICAgICBzaG91bGRUaHJvdygnbmV3IFJUQ0ljZUNhbmRpZGF0ZSh7Y2FuZGlkYXRlOiJmb28i LCBzZHBNaWQ6IHVuZGVmaW5lZCwgc2RwTUxpbmVJbmRleDogdW5kZWZpbmVkfSk7Jyk7CisgICAg ICAgICAgICBkZWJ1ZygiIik7CisKKyAgICAgICAgICAgIGRlYnVnKCJUZXN0IHRoYXQgc2RwTWlk IG9yIHNkcE1MaW5lSW5kZXggZXhwbGljaXRseSBzZXQgdG8gbnVsbCBvciB1bmRlZmluZWQsIHJl c3VsdHMgaW4gYSBudWxsIHZhbHVlLiIpOworICAgICAgICAgICAgc2hvdWxkTm90VGhyb3coJ2Nh bmRpZGF0ZSA9IG5ldyBSVENJY2VDYW5kaWRhdGUoe2NhbmRpZGF0ZToiZm9vIiwgc2RwTWlkOiBu dWxsLCBzZHBNTGluZUluZGV4OiAxfSk7Jyk7CisgICAgICAgICAgICBzaG91bGRCZU51bGwoImNh bmRpZGF0ZS5zZHBNaWQiKTsKKyAgICAgICAgICAgIHNob3VsZEJlKCJjYW5kaWRhdGUuc2RwTUxp bmVJbmRleCIsICIxIik7CisKKyAgICAgICAgICAgIHNob3VsZE5vdFRocm93KCdjYW5kaWRhdGUg PSBuZXcgUlRDSWNlQ2FuZGlkYXRlKHtjYW5kaWRhdGU6ImZvbyIsIHNkcE1pZDogdW5kZWZpbmVk LCBzZHBNTGluZUluZGV4OiAxfSk7Jyk7CisgICAgICAgICAgICBzaG91bGRCZU51bGwoImNhbmRp ZGF0ZS5zZHBNaWQiKTsKKyAgICAgICAgICAgIHNob3VsZEJlKCJjYW5kaWRhdGUuc2RwTUxpbmVJ bmRleCIsICIxIik7CisKKyAgICAgICAgICAgIHNob3VsZE5vdFRocm93KCdjYW5kaWRhdGUgPSBu ZXcgUlRDSWNlQ2FuZGlkYXRlKHtjYW5kaWRhdGU6ImZvbyIsIHNkcE1pZDogImZvbyIsIHNkcE1M aW5lSW5kZXg6IG51bGx9KTsnKTsKKyAgICAgICAgICAgIHNob3VsZEJlKCJjYW5kaWRhdGUuc2Rw TWlkIiwgIidmb28nIik7CisgICAgICAgICAgICBzaG91bGRCZU51bGwoImNhbmRpZGF0ZS5zZHBN TGluZUluZGV4Iik7CisKKyAgICAgICAgICAgIHNob3VsZE5vdFRocm93KCdjYW5kaWRhdGUgPSBu ZXcgUlRDSWNlQ2FuZGlkYXRlKHtjYW5kaWRhdGU6ImZvbyIsIHNkcE1pZDogImZvbyIsIHNkcE1M aW5lSW5kZXg6IHVuZGVmaW5lZH0pOycpOworICAgICAgICAgICAgc2hvdWxkQmUoImNhbmRpZGF0 ZS5zZHBNaWQiLCAiJ2ZvbyciKTsKKyAgICAgICAgICAgIHNob3VsZEJlTnVsbCgiY2FuZGlkYXRl LnNkcE1MaW5lSW5kZXgiKTsKICAgICAgICAgICAgIGRlYnVnKCIiKTsKIAogICAgICAgICAgICAg ZGVidWcoIldoZW4gb25lIG9mIHRoZSAnc2RwTWlkJyBvciAnc2RwTUxpbmVJbmRleCcgbWVtYmVy cyBpcyBzZXQsIHRoZSBvdGhlciBtdXN0IGJlIG51bGwuIik7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTQ2ZDZl Yi4uNTBmZjg1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE2LTA2LTE3ICBBZGFt IEJlcmdrdmlzdCAgPGFkYW0uYmVyZ2t2aXN0QGVyaWNzc29uLmNvbT4KKworICAgICAgICBXZWJS VEM6IFJUQ0ljZUNhbmRpZGF0ZSBpbml0IGRpY3Rpb25hcnkgZG9uJ3QgaGFuZGxlIGV4cGxpY2l0 IG51bGwgb3IgdW5kZWZpbmVkIHZhbHVlcyBjb3JyZWN0bHkKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1ODg3MworCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFByZXZlbnQgZXhwbGljaXQgbnVsbCBhbmQgdW5k ZWZpbmVkIHZhbHVlcyBmcm9tIGJlaW5nIGNvbnZlcnRlZCB0byAibnVsbCIgYW5kICJ1bmRlZmlu ZWQiCisgICAgICAgIHN0cmluZ3MuCisKKyAgICAgICAgVGVzdDogRXh0ZW5kZWQgZmFzdC9tZWRp YXN0cmVhbS9SVENJY2VDYW5kaWRhdGUuaHRtbAorCisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0 cmVhbS9SVENJY2VDYW5kaWRhdGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UlRDSWNlQ2FuZGlk YXRlOjpjcmVhdGUpOgorCiAyMDE2LTA2LTE4ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxl LmNvbT4KIAogICAgICAgICBVc2UgdGltZSBsaXRlcmFscyBpbiBXZWJDb3JlCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ0ljZUNhbmRpZGF0ZS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ0ljZUNhbmRpZGF0ZS5jcHAK aW5kZXggZjUwOTU2YS4uNTU1Njc4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9tZWRpYXN0cmVhbS9SVENJY2VDYW5kaWRhdGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvbWVkaWFzdHJlYW0vUlRDSWNlQ2FuZGlkYXRlLmNwcApAQCAtNTAsMTIgKzUwLDEyIEBA IFJlZlB0cjxSVENJY2VDYW5kaWRhdGU+IFJUQ0ljZUNhbmRpZGF0ZTo6Y3JlYXRlKGNvbnN0IERp Y3Rpb25hcnkmIGRpY3Rpb25hcnksIEV4CiAgICAgfQogCiAgICAgU3RyaW5nIHNkcE1pZDsKLSAg ICBkaWN0aW9uYXJ5LmdldCgic2RwTWlkIiwgc2RwTWlkKTsKKyAgICBkaWN0aW9uYXJ5LmdldFdp dGhVbmRlZmluZWRPck51bGxDaGVjaygic2RwTWlkIiwgc2RwTWlkKTsKIAogICAgIE9wdGlvbmFs PHVuc2lnbmVkIHNob3J0PiBzZHBNTGluZUluZGV4OwogICAgIFN0cmluZyBzZHBNTGluZUluZGV4 U3RyaW5nOwogCi0gICAgaWYgKGRpY3Rpb25hcnkuZ2V0KCJzZHBNTGluZUluZGV4Iiwgc2RwTUxp bmVJbmRleFN0cmluZykpIHsKKyAgICBpZiAoZGljdGlvbmFyeS5nZXRXaXRoVW5kZWZpbmVkT3JO dWxsQ2hlY2soInNkcE1MaW5lSW5kZXgiLCBzZHBNTGluZUluZGV4U3RyaW5nKSkgewogICAgICAg ICBib29sIGludENvbnZlcnNpb25PazsKICAgICAgICAgdW5zaWduZWQgcmVzdWx0ID0gc2RwTUxp bmVJbmRleFN0cmluZy50b1VJbnRTdHJpY3QoJmludENvbnZlcnNpb25Payk7CiAgICAgICAgIGlm ICghaW50Q29udmVyc2lvbk9rIHx8IHJlc3VsdCA+IFVTSFJUX01BWCkgewo=