92857 2012-08-01 02:34:08 -0700 [BlackBerry] Favicon should be Base64 encoded for cross-process passing 2012-08-01 20:56:01 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 charles.wei charles.wei mifenton rwlbuis staikos tonikitoo webkit.review.bot yong.li.webkit oldest_to_newest 684026 0 charles.wei 2012-08-01 02:34:08 -0700 Internal tracking No. 186242 Favicon should be Base64 encoded for cross-process passing to Chrome which is in another process. 684079 1 155780 charles.wei 2012-08-01 04:44:25 -0700 Created attachment 155780 Patch 684174 2 155780 yong.li.webkit 2012-08-01 07:13:03 -0700 Comment on attachment 155780 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=155780&action=review r+ otherwise > Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp:1193 > + if (!bitmap->bitmap().empty()) { early return looks better. > Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp:1205 > + Vector<char> out; > + base64Encode(static_cast<const char*>(data->data()), data->size(), out); > + char* buffer = new char[out.size() + 1]; > + memcpy(buffer, out.data(), out.size()); > + buffer[out.size()] = '\0'; out.append('\0') should work, so no need to create a new buffer and memcpy? > Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp:1208 > + delete []buffer; "delete[] buffer;" is more clear, if we do need this buffer. From my point of view, Vector<char> always beats new[]/delete[] 684192 3 155780 staikos 2012-08-01 08:02:03 -0700 Comment on attachment 155780 Patch I agree with your comments on the buffer and had this chat with Charles earlier today. r- for these comments in fact. 684924 4 155957 charles.wei 2012-08-01 20:11:27 -0700 Created attachment 155957 Patch 684927 5 155957 staikos 2012-08-01 20:19:06 -0700 Comment on attachment 155957 Patch Better 684935 6 155957 charles.wei 2012-08-01 20:47:08 -0700 Comment on attachment 155957 Patch Thanks, George and Yong, for the comments. 684944 7 155957 webkit.review.bot 2012-08-01 20:55:57 -0700 Comment on attachment 155957 Patch Clearing flags on attachment: 155957 Committed r124403: <http://trac.webkit.org/changeset/124403> 684945 8 webkit.review.bot 2012-08-01 20:56:01 -0700 All reviewed patches have been landed. Closing bug. 155780 2012-08-01 04:44:25 -0700 2012-08-01 20:11:18 -0700 Patch bug-92857-20120801194406.patch text/plain 4198 charles.wei U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0MzE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCAxOGVjNDc0NDk3ZTVkNGViNGZkNmY0ZDFiMGM5MDUxZmJiYTFlYjVjLi40NmVjYTgyZTkz MWI1ZGVlOTYwMzM5YmQ3ZGYyZDdlYmNlMDgwMzNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMi0wOC0wMSAgQ2hhcmxlcyBXZWkgIDxjaGFybGVz LndlaUB0b3JjaG1vYmlsZS5jb20uY24+CisKKyAgICAgICAgW0JsYWNrQmVycnldIEZhdmljb24g c2hvdWxkIGJlIEJhc2U2NCBlbmNvZGVkIGZvciBjcm9zcy1wcm9jZXNzIHBhc3NpbmcKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkyODU3CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGN1cnJlbnQgaW1w bGVtZW50YXRpb24ganVzdCBwYXNzZXMgdGhlIGludGVybmFsIG9mIFNrUGl4ZWxzIGRhdGEgdG8g dGhlIGNsaWVudCwKKyAgICAgICAgd2hpY2ggY2FuJ3QgYmUgcGFzc2VkIGFjY3Jvc3MgdGhlIHBy b2Nlc3MgYm91bmRhcnkgdG8gY2hyb21lIGZvciBwcm9jZXNzaW5nLgorICAgICAgICBUaGlzIHBh dGNoIG1ha2VzIHRoZSBmYXZpY29uIEJhc2U2NCBlbmNvZGVkIHNvIHRoYXQgY2FuIGJlIHBhc3Nl ZCB0byBjaHJvbWUgaW4gYW5vdGhlciBwcm9jZXNzLgorCisgICAgICAgICogQXBpL1dlYlBhZ2VD bGllbnQuaDoKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEJsYWNr QmVycnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5 OjpkaXNwYXRjaERpZFJlY2VpdmVJY29uKToKKwogMjAxMi0wNy0zMSAgUm9iaW4gQ2FvICA8cm9i aW4uY2FvQHRvcmNobW9iaWxlLmNvbS5jbj4KIAogICAgICAgICBbQmxhY2tCZXJyeV0gUGFzcyBh bGwgZmlsZSBjaG9vc2VyIHNldHRpbmdzIHRvIGNsaWVudHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZUNsaWVudC5oIGIvU291cmNlL1dlYktpdC9ibGFj a2JlcnJ5L0FwaS9XZWJQYWdlQ2xpZW50LmgKaW5kZXggMTU0MGJhYzAzNDFkNmQ3NTAxYWMzYTEw NjY2ODFiNzdkYjVmOTdkYS4uMGRhNzMxOGIyN2RkZjJhMjQzMWJiZTJjMzI1OTU3OWViZjQ4ZjRk MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlQ2xpZW50 LmgKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlQ2xpZW50LmgKQEAg LTE4Nyw3ICsxODcsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB1bnNpZ25lZCBsb25nIGxvbmcg ZGF0YWJhc2VRdW90YShjb25zdCB1bnNpZ25lZCBzaG9ydCogb3JpZ2luLCB1bnNpZ25lZCBvcmln aW5MZW5ndGgsIGNvbnN0IHVuc2lnbmVkIHNob3J0KiBkYXRhYmFzZU5hbWUsIHVuc2lnbmVkIGRh dGFiYXNlTmFtZUxlbmd0aCwgdW5zaWduZWQgbG9uZyBsb25nIHRvdGFsVXNhZ2UsIHVuc2lnbmVk IGxvbmcgbG9uZyBvcmlnaW5Vc2FnZSwgdW5zaWduZWQgbG9uZyBsb25nIGVzdGltYXRlZFNpemUp ID0gMDsKIAogICAgIHZpcnR1YWwgdm9pZCBzZXRJY29uRm9yVXJsKGNvbnN0IGNoYXIqIG9yaWdp bmFsUGFnZVVybCwgY29uc3QgY2hhciogZmluYWxQYWdlVXJsLCBjb25zdCBjaGFyKiBpY29uVXJs KSA9IDA7Ci0gICAgdmlydHVhbCB2b2lkIHNldEZhdmljb24oaW50IHdpZHRoLCBpbnQgaGVpZ2h0 LCB1bnNpZ25lZCBjaGFyKiBpY29uRGF0YSwgY29uc3QgY2hhciogdXJsKSA9IDA7CisgICAgdmly dHVhbCB2b2lkIHNldEZhdmljb24oY29uc3QgY2hhciogZGF0YUluQmFzZTY0LCBjb25zdCBjaGFy KiB1cmwpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgc2V0TGFyZ2VJY29uKGNvbnN0IGNoYXIqIGlj b25VcmwpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgc2V0V2ViQXBwQ2FwYWJsZSgpID0gMDsKICAg ICB2aXJ0dWFsIHZvaWQgc2V0U2VhcmNoUHJvdmlkZXJEZXRhaWxzKGNvbnN0IGNoYXIqIHRpdGxl LCBjb25zdCBjaGFyKiBkb2N1bWVudFVybCkgPSAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5j cHAgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJD bGllbnRCbGFja0JlcnJ5LmNwcAppbmRleCBjZjIyYWI2YWQ2NzYxYTAzOTdlYmUyNzU1NzI4Y2I2 NzE0ZjVhMTVlLi4yY2U4NzM4NjI1MjkyODAxNmY3ZmI3ZWZiOTJiNTgzYTJmMzgxNjczIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2Fk ZXJDbGllbnRCbGFja0JlcnJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2Vi Q29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5LmNwcApAQCAtNTgsNiArNTgs OSBAQAogI2luY2x1ZGUgIlByb3RlY3Rpb25TcGFjZS5oIgogI2luY2x1ZGUgIlNjb3BlUG9pbnRl ci5oIgogI2luY2x1ZGUgIlNoYXJlZEJ1ZmZlci5oIgorI2luY2x1ZGUgIlNrRGF0YS5oIgorI2lu Y2x1ZGUgIlNrSW1hZ2VFbmNvZGVyLmgiCisjaW5jbHVkZSAiU2tTdHJlYW0uaCIKICNpbmNsdWRl ICJUZXh0RW5jb2RpbmcuaCIKICNpbmNsdWRlICJUb3VjaEV2ZW50SGFuZGxlci5oIgogI2lmIEVO QUJMRShXRUJET00pCkBAIC0xMTg3LDEwICsxMTkwLDI0IEBAIHZvaWQgRnJhbWVMb2FkZXJDbGll bnRCbGFja0JlcnJ5OjpkaXNwYXRjaERpZFJlY2VpdmVJY29uKCkKICAgICBpZiAoIWJpdG1hcCkK ICAgICAgICAgcmV0dXJuOwogCi0gICAgYml0bWFwLT5sb2NrUGl4ZWxzKCk7Ci0gICAgU3RyaW5n IGljb25VcmwgPSBpY29uRGF0YWJhc2UoKS5zeW5jaHJvbm91c0ljb25VUkxGb3JQYWdlVVJMKHVy bCk7Ci0gICAgbV93ZWJQYWdlUHJpdmF0ZS0+bV9jbGllbnQtPnNldEZhdmljb24oaW1nLT53aWR0 aCgpLCBpbWctPmhlaWdodCgpLCAodW5zaWduZWQgY2hhciopYml0bWFwLT5nZXRQaXhlbHMoKSwg aWNvblVybC51dGY4KCkuZGF0YSgpKTsKLSAgICBiaXRtYXAtPnVubG9ja1BpeGVscygpOworICAg IGlmICghYml0bWFwLT5iaXRtYXAoKS5lbXB0eSgpKSB7CisgICAgICAgIFNrQXV0b0xvY2tQaXhl bHMgbG9ja2VyKGJpdG1hcC0+Yml0bWFwKCkpOworICAgICAgICBTa0R5bmFtaWNNZW1vcnlXU3Ry ZWFtIHdyaXRlcjsKKyAgICAgICAgaWYgKCFTa0ltYWdlRW5jb2Rlcjo6RW5jb2RlU3RyZWFtKCZ3 cml0ZXIsIGJpdG1hcC0+Yml0bWFwKCksIFNrSW1hZ2VFbmNvZGVyOjprUE5HX1R5cGUsIDEwMCkp IHsKKyAgICAgICAgICAgICBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6bG9nKEJsYWNrQmVycnk6OlBs YXRmb3JtOjpMb2dMZXZlbEluZm8sICJGYWlsZWQgdG8gY29udmVydCB0aGUgaWNvbiB0byBQTkcg Zm9ybWF0LiIpOworICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBTa0Rh dGEqIGRhdGEgPSB3cml0ZXIuY29weVRvRGF0YSgpOworICAgICAgICBWZWN0b3I8Y2hhcj4gb3V0 OworICAgICAgICBiYXNlNjRFbmNvZGUoc3RhdGljX2Nhc3Q8Y29uc3QgY2hhcio+KGRhdGEtPmRh dGEoKSksIGRhdGEtPnNpemUoKSwgb3V0KTsKKyAgICAgICAgY2hhciogYnVmZmVyID0gbmV3IGNo YXJbb3V0LnNpemUoKSArIDFdOworICAgICAgICBtZW1jcHkoYnVmZmVyLCBvdXQuZGF0YSgpLCBv dXQuc2l6ZSgpKTsKKyAgICAgICAgYnVmZmVyW291dC5zaXplKCldID0gJ1wwJzsKKyAgICAgICAg U3RyaW5nIGljb25VcmwgPSBpY29uRGF0YWJhc2UoKS5zeW5jaHJvbm91c0ljb25VUkxGb3JQYWdl VVJMKHVybCk7CisgICAgICAgIG1fd2ViUGFnZVByaXZhdGUtPm1fY2xpZW50LT5zZXRGYXZpY29u KGJ1ZmZlciwgaWNvblVybC51dGY4KCkuZGF0YSgpKTsKKyAgICAgICAgZGVsZXRlIFtdYnVmZmVy OworICAgICAgICBkYXRhLT51bnJlZigpOworICAgIH0KIH0KIAogYm9vbCBGcmFtZUxvYWRlckNs aWVudEJsYWNrQmVycnk6OmNhbkNhY2hlUGFnZSgpIGNvbnN0Cg== 155957 2012-08-01 20:11:27 -0700 2012-08-01 20:55:56 -0700 Patch bug-92857-20120802111107.patch text/plain 4136 charles.wei U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0MzE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCAxOGVjNDc0NDk3ZTVkNGViNGZkNmY0ZDFiMGM5MDUxZmJiYTFlYjVjLi40NmVjYTgyZTkz MWI1ZGVlOTYwMzM5YmQ3ZGYyZDdlYmNlMDgwMzNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMi0wOC0wMSAgQ2hhcmxlcyBXZWkgIDxjaGFybGVz LndlaUB0b3JjaG1vYmlsZS5jb20uY24+CisKKyAgICAgICAgW0JsYWNrQmVycnldIEZhdmljb24g c2hvdWxkIGJlIEJhc2U2NCBlbmNvZGVkIGZvciBjcm9zcy1wcm9jZXNzIHBhc3NpbmcKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkyODU3CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGN1cnJlbnQgaW1w bGVtZW50YXRpb24ganVzdCBwYXNzZXMgdGhlIGludGVybmFsIG9mIFNrUGl4ZWxzIGRhdGEgdG8g dGhlIGNsaWVudCwKKyAgICAgICAgd2hpY2ggY2FuJ3QgYmUgcGFzc2VkIGFjY3Jvc3MgdGhlIHBy b2Nlc3MgYm91bmRhcnkgdG8gY2hyb21lIGZvciBwcm9jZXNzaW5nLgorICAgICAgICBUaGlzIHBh dGNoIG1ha2VzIHRoZSBmYXZpY29uIEJhc2U2NCBlbmNvZGVkIHNvIHRoYXQgY2FuIGJlIHBhc3Nl ZCB0byBjaHJvbWUgaW4gYW5vdGhlciBwcm9jZXNzLgorCisgICAgICAgICogQXBpL1dlYlBhZ2VD bGllbnQuaDoKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEJsYWNr QmVycnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5 OjpkaXNwYXRjaERpZFJlY2VpdmVJY29uKToKKwogMjAxMi0wNy0zMSAgUm9iaW4gQ2FvICA8cm9i aW4uY2FvQHRvcmNobW9iaWxlLmNvbS5jbj4KIAogICAgICAgICBbQmxhY2tCZXJyeV0gUGFzcyBh bGwgZmlsZSBjaG9vc2VyIHNldHRpbmdzIHRvIGNsaWVudHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZUNsaWVudC5oIGIvU291cmNlL1dlYktpdC9ibGFj a2JlcnJ5L0FwaS9XZWJQYWdlQ2xpZW50LmgKaW5kZXggMTU0MGJhYzAzNDFkNmQ3NTAxYWMzYTEw NjY2ODFiNzdkYjVmOTdkYS4uMGRhNzMxOGIyN2RkZjJhMjQzMWJiZTJjMzI1OTU3OWViZjQ4ZjRk MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlQ2xpZW50 LmgKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlQ2xpZW50LmgKQEAg LTE4Nyw3ICsxODcsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB1bnNpZ25lZCBsb25nIGxvbmcg ZGF0YWJhc2VRdW90YShjb25zdCB1bnNpZ25lZCBzaG9ydCogb3JpZ2luLCB1bnNpZ25lZCBvcmln aW5MZW5ndGgsIGNvbnN0IHVuc2lnbmVkIHNob3J0KiBkYXRhYmFzZU5hbWUsIHVuc2lnbmVkIGRh dGFiYXNlTmFtZUxlbmd0aCwgdW5zaWduZWQgbG9uZyBsb25nIHRvdGFsVXNhZ2UsIHVuc2lnbmVk IGxvbmcgbG9uZyBvcmlnaW5Vc2FnZSwgdW5zaWduZWQgbG9uZyBsb25nIGVzdGltYXRlZFNpemUp ID0gMDsKIAogICAgIHZpcnR1YWwgdm9pZCBzZXRJY29uRm9yVXJsKGNvbnN0IGNoYXIqIG9yaWdp bmFsUGFnZVVybCwgY29uc3QgY2hhciogZmluYWxQYWdlVXJsLCBjb25zdCBjaGFyKiBpY29uVXJs KSA9IDA7Ci0gICAgdmlydHVhbCB2b2lkIHNldEZhdmljb24oaW50IHdpZHRoLCBpbnQgaGVpZ2h0 LCB1bnNpZ25lZCBjaGFyKiBpY29uRGF0YSwgY29uc3QgY2hhciogdXJsKSA9IDA7CisgICAgdmly dHVhbCB2b2lkIHNldEZhdmljb24oY29uc3QgY2hhciogZGF0YUluQmFzZTY0LCBjb25zdCBjaGFy KiB1cmwpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgc2V0TGFyZ2VJY29uKGNvbnN0IGNoYXIqIGlj b25VcmwpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgc2V0V2ViQXBwQ2FwYWJsZSgpID0gMDsKICAg ICB2aXJ0dWFsIHZvaWQgc2V0U2VhcmNoUHJvdmlkZXJEZXRhaWxzKGNvbnN0IGNoYXIqIHRpdGxl LCBjb25zdCBjaGFyKiBkb2N1bWVudFVybCkgPSAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5j cHAgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJD bGllbnRCbGFja0JlcnJ5LmNwcAppbmRleCBjZjIyYWI2YWQ2NzYxYTAzOTdlYmUyNzU1NzI4Y2I2 NzE0ZjVhMTVlLi40ODA3ZTZkMmQ0OTE2NTFhZTI3NjgzNTk4N2IzYmVmNzY4MWNlZWYzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2Fk ZXJDbGllbnRCbGFja0JlcnJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2Vi Q29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5LmNwcApAQCAtNTgsNiArNTgs OSBAQAogI2luY2x1ZGUgIlByb3RlY3Rpb25TcGFjZS5oIgogI2luY2x1ZGUgIlNjb3BlUG9pbnRl ci5oIgogI2luY2x1ZGUgIlNoYXJlZEJ1ZmZlci5oIgorI2luY2x1ZGUgIlNrRGF0YS5oIgorI2lu Y2x1ZGUgIlNrSW1hZ2VFbmNvZGVyLmgiCisjaW5jbHVkZSAiU2tTdHJlYW0uaCIKICNpbmNsdWRl ICJUZXh0RW5jb2RpbmcuaCIKICNpbmNsdWRlICJUb3VjaEV2ZW50SGFuZGxlci5oIgogI2lmIEVO QUJMRShXRUJET00pCkBAIC0xMTg0LDEzICsxMTg3LDIyIEBAIHZvaWQgRnJhbWVMb2FkZXJDbGll bnRCbGFja0JlcnJ5OjpkaXNwYXRjaERpZFJlY2VpdmVJY29uKCkKIHsKICAgICBTdHJpbmcgdXJs ID0gbV9mcmFtZS0+ZG9jdW1lbnQoKS0+dXJsKCkuc3RyaW5nKCk7CiAgICAgTmF0aXZlSW1hZ2VT a2lhKiBiaXRtYXAgPSBpY29uRGF0YWJhc2UoKS5zeW5jaHJvbm91c05hdGl2ZUljb25Gb3JQYWdl VVJMKHVybCwgSW50U2l6ZSgxMCwgMTApKTsKLSAgICBpZiAoIWJpdG1hcCkKKyAgICBpZiAoIWJp dG1hcCB8fCBiaXRtYXAtPmJpdG1hcCgpLmVtcHR5KCkpCiAgICAgICAgIHJldHVybjsKIAotICAg IGJpdG1hcC0+bG9ja1BpeGVscygpOworICAgIFNrQXV0b0xvY2tQaXhlbHMgbG9ja2VyKGJpdG1h cC0+Yml0bWFwKCkpOworICAgIFNrRHluYW1pY01lbW9yeVdTdHJlYW0gd3JpdGVyOworICAgIGlm ICghU2tJbWFnZUVuY29kZXI6OkVuY29kZVN0cmVhbSgmd3JpdGVyLCBiaXRtYXAtPmJpdG1hcCgp LCBTa0ltYWdlRW5jb2Rlcjo6a1BOR19UeXBlLCAxMDApKSB7CisgICAgICAgIEJsYWNrQmVycnk6 OlBsYXRmb3JtOjpsb2dBbHdheXMoQmxhY2tCZXJyeTo6UGxhdGZvcm06OkxvZ0xldmVsSW5mbywg IkZhaWxlZCB0byBjb252ZXJ0IHRoZSBpY29uIHRvIFBORyBmb3JtYXQuIik7CisgICAgICAgIHJl dHVybjsKKyAgICB9CisgICAgU2tEYXRhKiBkYXRhID0gd3JpdGVyLmNvcHlUb0RhdGEoKTsKKyAg ICBWZWN0b3I8Y2hhcj4gb3V0OworICAgIGJhc2U2NEVuY29kZShzdGF0aWNfY2FzdDxjb25zdCBj aGFyKj4oZGF0YS0+ZGF0YSgpKSwgZGF0YS0+c2l6ZSgpLCBvdXQpOworICAgIG91dC5hcHBlbmQo J1wwJyk7IC8vIE1ha2UgaXQgbnVsbC10ZXJtaW5hdGVkLgogICAgIFN0cmluZyBpY29uVXJsID0g aWNvbkRhdGFiYXNlKCkuc3luY2hyb25vdXNJY29uVVJMRm9yUGFnZVVSTCh1cmwpOwotICAgIG1f d2ViUGFnZVByaXZhdGUtPm1fY2xpZW50LT5zZXRGYXZpY29uKGltZy0+d2lkdGgoKSwgaW1nLT5o ZWlnaHQoKSwgKHVuc2lnbmVkIGNoYXIqKWJpdG1hcC0+Z2V0UGl4ZWxzKCksIGljb25VcmwudXRm OCgpLmRhdGEoKSk7Ci0gICAgYml0bWFwLT51bmxvY2tQaXhlbHMoKTsKKyAgICBtX3dlYlBhZ2VQ cml2YXRlLT5tX2NsaWVudC0+c2V0RmF2aWNvbihvdXQuZGF0YSgpLCBpY29uVXJsLnV0ZjgoKS5k YXRhKCkpOworICAgIGRhdGEtPnVucmVmKCk7CiB9CiAKIGJvb2wgRnJhbWVMb2FkZXJDbGllbnRC bGFja0JlcnJ5OjpjYW5DYWNoZVBhZ2UoKSBjb25zdAo=