106633 2013-01-10 23:26:17 -0800 [EFL][WK2] Add APIs to set/get view source mode 2013-01-21 18:04:25 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jinwoo7.song jinwoo7.song benjamin gyuyoung.kim laszlo.gombos lucas.de.marchi rakuco sam webkitbottester webkit.review.bot oldest_to_newest 804991 0 jinwoo7.song 2013-01-10 23:26:17 -0800 Add APIs to set/get a view source mode for enabling to load the source code of the web page. 804995 1 182272 jinwoo7.song 2013-01-10 23:36:31 -0800 Created attachment 182272 Patch 806815 2 182272 benjamin 2013-01-14 17:28:02 -0800 Comment on attachment 182272 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=182272&action=review Laszlo, feel free to review the EFL bits and then tell me in comments or on IRC when to rs+. > Source/WebKit2/UIProcess/API/efl/EwkViewImpl.h:218 > + void setInViewSourceMode(bool set) { m_inViewSourceMode = set; } > + bool inViewSourceMode() const { return m_inViewSourceMode; } This may be better done on WebPageProxy? > Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:937 > + impl->page()->setMainFrameInViewSourceMode(enabled); > + impl->setInViewSourceMode(enabled); This is odd. 806849 3 gyuyoung.kim 2013-01-14 18:05:05 -0800 (In reply to comment #2) > (From update of attachment 182272 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=182272&action=review > > Laszlo, feel free to review the EFL bits and then tell me in comments or on IRC when to rs+. Do you mean we should not set r+ even on EFL port patches ? 806857 4 benjamin 2013-01-14 18:16:18 -0800 (In reply to comment #3) > (In reply to comment #2) > > (From update of attachment 182272 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=182272&action=review > > > > Laszlo, feel free to review the EFL bits and then tell me in comments or on IRC when to rs+. > > Do you mean we should not set r+ even on EFL port patches ? Wasn't that the policy? I'll check my emails again. 806866 5 benjamin 2013-01-14 18:25:19 -0800 > > Do you mean we should not set r+ even on EFL port patches ? > > Wasn't that the policy? I'll check my emails again. It looks like it (check the webkit-dev thread). 806882 6 gyuyoung.kim 2013-01-14 18:51:53 -0800 (In reply to comment #5) > > > Do you mean we should not set r+ even on EFL port patches ? > > > > Wasn't that the policy? I'll check my emails again. > > It looks like it (check the webkit-dev thread). I don't know if the policy is decided on "[webkit-dev] Changes to the WebKit2 development process". It looks there are still some questions. 806927 7 182272 jinwoo7.song 2013-01-14 20:26:03 -0800 Comment on attachment 182272 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=182272&action=review >> Source/WebKit2/UIProcess/API/efl/EwkViewImpl.h:218 >> + bool inViewSourceMode() const { return m_inViewSourceMode; } > > This may be better done on WebPageProxy? Yes, I totally agree with you. Then, I'll fix setMainFrameInViewSourceMode() to store the status and add mainFrameInViewSourceMode() to get the status. Is it plausible? 807122 8 182720 jinwoo7.song 2013-01-15 01:49:36 -0800 Created attachment 182720 Patch 807131 9 182720 gyuyoung.kim 2013-01-15 02:12:34 -0800 Comment on attachment 182720 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=182720&action=review Looks good to me on EFL port side. But, it looks Apple reviewer might wanna take a final look. > Source/WebKit2/UIProcess/API/efl/ewk_view.h:888 > + * Get the view source mode of the current web page. Gets ? > Tools/MiniBrowser/efl/main.c:300 > + } else if (!strcmp(ev->key, "F8")) { Nit: Two spaces in "if (" 807145 10 182727 jinwoo7.song 2013-01-15 02:31:15 -0800 Created attachment 182727 Patch Fixed nits. 808001 11 182727 gyuyoung.kim 2013-01-15 20:21:41 -0800 Comment on attachment 182727 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=182727&action=review > Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp:955 > + EXPECT_FALSE(ewk_view_source_mode_get(webView())); Can't you add a test for ewk_view_source_mode_set() at least ? 808113 12 182929 jinwoo7.song 2013-01-16 00:23:44 -0800 Created attachment 182929 Patch Applied Gyuyoung's comment. 808167 13 182929 gyuyoung.kim 2013-01-16 01:43:29 -0800 Comment on attachment 182929 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=182929&action=review LGTM except for trivial comment. > Tools/MiniBrowser/efl/main.c:306 > + Browser_Window *window = window_create(0, DEFAULT_URL, 0, 0, EINA_FALSE); Shouldn't you use NULL instead of 0 for first parameter of window_create(Evas_Object* opener, const char *url, int width, int height) ? > Tools/MiniBrowser/efl/main.c:1325 > + window = window_create(0, url, 0, 0, EINA_FALSE); ditto ? > Tools/MiniBrowser/efl/main.c:1328 > + window = window_create(0, DEFAULT_URL, 0, 0, EINA_FALSE); ditto ? 808863 14 183066 jinwoo7.song 2013-01-16 17:11:12 -0800 Created attachment 183066 Patch Used NULL instead of 0 as Gyuyoung's comments. 808937 15 183066 gyuyoung.kim 2013-01-16 18:21:48 -0800 Comment on attachment 183066 Patch Benjamin? If there is no comment, I would like to land this. 810005 16 183066 benjamin 2013-01-17 17:45:02 -0800 Comment on attachment 183066 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=183066&action=review > Source/WebKit2/UIProcess/WebPageProxy.h:1237 > > + bool m_mainFrameInViewSourceMode; > + Please move the attribute close to the other mainFrame attributes. It is better to have related attributes grouped together. 810228 17 183371 jinwoo7.song 2013-01-17 21:59:23 -0800 Created attachment 183371 Patch Applied Benjamin's comment. 810230 18 183372 jinwoo7.song 2013-01-17 22:03:36 -0800 Created attachment 183372 Patch 812500 19 183372 webkit.review.bot 2013-01-21 17:54:16 -0800 Comment on attachment 183372 Patch Clearing flags on attachment: 183372 Committed r140376: <http://trac.webkit.org/changeset/140376> 812501 20 webkit.review.bot 2013-01-21 17:54:23 -0800 All reviewed patches have been landed. Closing bug. 812506 21 sam 2013-01-21 18:04:25 -0800 In the future, please (In reply to comment #6) > (In reply to comment #5) > > > > Do you mean we should not set r+ even on EFL port patches ? > > > > > > Wasn't that the policy? I'll check my emails again. > > > > It looks like it (check the webkit-dev thread). > > I don't know if the policy is decided on "[webkit-dev] Changes to the WebKit2 development process". It looks there are still some questions. The policy was decided. Please don't review patches that touch WebKit2 if you are not listed in the Owners file. 182272 2013-01-10 23:36:31 -0800 2013-01-15 01:49:29 -0800 Patch bug-106633-20130111163332.patch text/plain 10441 jinwoo7.song U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5NDA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZmNmM2E3MDhiNjg3MzBm NGJkNGZiYjc1NzZmZGY5NWYwOWVlYTYxMC4uODMwYmIzYTVjMDk0MmQ3YzJiZDlkNWM2MjY5Njdi NmYwMjEyOWZkMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEzLTAxLTEwICBKaW53 b28gU29uZyAgPGppbndvbzcuc29uZ0BzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJd IEFkZCBBUElzIHRvIHNldC9nZXQgdmlldyBzb3VyY2UgbW9kZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA2NjMzCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgQVBJcyB0byBzZXQvZ2V0IHZpZXcg c291cmNlIG1vZGUgZm9yIGVuYWJsaW5nIHRvIGxvYWQgCisgICAgICAgIHRoZSBzb3VyY2UgY29k ZSBvZiB0aGUgd2ViIHBhZ2UuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3 SW1wbC5jcHA6CisgICAgICAgIChFd2tWaWV3SW1wbDo6RXdrVmlld0ltcGwpOgorICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXdJbXBsLmg6CisgICAgICAgIChFd2tWaWV3SW1wbDo6 c2V0SW5WaWV3U291cmNlTW9kZSk6CisgICAgICAgIChFd2tWaWV3SW1wbDo6aW5WaWV3U291cmNl TW9kZSk6CisgICAgICAgIChFd2tWaWV3SW1wbCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9l ZmwvZXdrX3ZpZXcuY3BwOgorICAgICAgICAoZXdrX3ZpZXdfc291cmNlX21vZGVfc2V0KToKKyAg ICAgICAgKGV3a192aWV3X3NvdXJjZV9tb2RlX2dldCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9lZmwvZXdrX3ZpZXcuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0 X2V3azJfdmlldy5jcHA6CisgICAgICAgIChURVNUX0YpOgorCiAyMDEzLTAxLTEwICBIdWFuZyBE b25nc3VuZyAgPGx1eHRlbGxhQGNvbXBhbnkxMDAubmV0PgogCiAgICAgICAgIFtRdF1bRUZMXSBS ZW5hbWUgZnJvbSB4eHhDb250ZW50c1NjYWxlKCkgdG8geHh4U2NhbGUoKSBpbiBQYWdlVmlld3Bv cnRDb250cm9sbGVyLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvRXdrVmlld0ltcGwuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdr Vmlld0ltcGwuY3BwCmluZGV4IDBlYmU1ZjlhYjYzY2Y3MDI3ODA1YWJkZmIyYWJjYmRmNDkwNmIz YzIuLmZkNjM4MWZiYjQ0M2Y2ZGFhYWQzMTgwYTU4Y2E5ZGE3MzE5YmM3NzggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXdJbXBsLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3SW1wbC5jcHAKQEAgLTE0Myw2 ICsxNDMsNyBAQCBFd2tWaWV3SW1wbDo6RXdrVmlld0ltcGwoRXZhc19PYmplY3QqIHZpZXcsIFBh c3NSZWZQdHI8RXdrQ29udGV4dD4gY29udGV4dCwgUGFzcwogICAgICwgbV9pbnB1dE1ldGhvZENv bnRleHQoSW5wdXRNZXRob2RDb250ZXh0RWZsOjpjcmVhdGUodGhpcywgc21hcnREYXRhKCktPmJh c2UuZXZhcykpCiAgICAgLCBtX2lzSGFyZHdhcmVBY2NlbGVyYXRlZCh0cnVlKQogICAgICwgbV9z ZXREcmF3c0JhY2tncm91bmQoZmFsc2UpCisgICAgLCBtX2luVmlld1NvdXJjZU1vZGUoZmFsc2Up CiB7CiAgICAgQVNTRVJUKG1fdmlldyk7CiAgICAgQVNTRVJUKG1fY29udGV4dCk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3SW1wbC5oIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlld0ltcGwuaAppbmRleCBiY2QxYzVk ZmQzMThjNDJhOGU5N2Q4NzFlMjAzZmVkZWQ1YTk1MGViLi40MzMzYTgxZTA3YzI5OGY3ODNiMDhl MjU5NGNiMDZjZjBlOTAxZjJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2VmbC9Fd2tWaWV3SW1wbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv ZWZsL0V3a1ZpZXdJbXBsLmgKQEAgLTIxNCw2ICsyMTQsOSBAQCBwdWJsaWM6CiAKICAgICBQYXNz UmVmUHRyPGNhaXJvX3N1cmZhY2VfdD4gdGFrZVNuYXBzaG90KCk7CiAKKyAgICB2b2lkIHNldElu Vmlld1NvdXJjZU1vZGUoYm9vbCBzZXQpIHsgbV9pblZpZXdTb3VyY2VNb2RlID0gc2V0OyB9Cisg ICAgYm9vbCBpblZpZXdTb3VyY2VNb2RlKCkgY29uc3QgeyByZXR1cm4gbV9pblZpZXdTb3VyY2VN b2RlOyB9CisKIHByaXZhdGU6CiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQogICAg IEV2YXNfR0xfQ29udGV4dCogZXZhc0dMQ29udGV4dCgpIHsgcmV0dXJuIG1fZXZhc0dMQ29udGV4 dCA/IG1fZXZhc0dMQ29udGV4dC0+Y29udGV4dCgpIDogMDsgfQpAQCAtMjg3LDYgKzI5MCw3IEBA IHByaXZhdGU6CiAjZW5kaWYKICAgICBib29sIG1faXNIYXJkd2FyZUFjY2VsZXJhdGVkOwogICAg IGJvb2wgbV9zZXREcmF3c0JhY2tncm91bmQ7CisgICAgYm9vbCBtX2luVmlld1NvdXJjZU1vZGU7 CiB9OwogCiAjZW5kaWYgLy8gRXdrVmlld0ltcGxfaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwCmluZGV4IDE1NGU5YzYxZjc2NTg1MzAzZDczYmJmNWU3 ZjAxYTkxY2UzYTg1NjQuLjdjYTQ0ZDkzZjdjZDc5MWJjYzRkMmYxZTExNzk0N2VmZDA2M2FlMDgg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAKQEAg LTkyOCwzICs5MjgsMjAgQEAgdm9pZCBld2tfdmlld19kcmF3c19wYWdlX2JhY2tncm91bmRfc2V0 KEV2YXNfT2JqZWN0ICpld2tWaWV3LCBFaW5hX0Jvb2wgZW5hYmxlZCkKIAogICAgIGltcGwtPnNl dERyYXdzQmFja2dyb3VuZChlbmFibGVkKTsKIH0KKworRWluYV9Cb29sIGV3a192aWV3X3NvdXJj ZV9tb2RlX3NldChFdmFzX09iamVjdCogZXdrVmlldywgRWluYV9Cb29sIGVuYWJsZWQpCit7Cisg ICAgRVdLX1ZJRVdfSU1QTF9HRVRfT1JfUkVUVVJOKGV3a1ZpZXcsIGltcGwsIGZhbHNlKTsKKwor ICAgIGltcGwtPnBhZ2UoKS0+c2V0TWFpbkZyYW1lSW5WaWV3U291cmNlTW9kZShlbmFibGVkKTsK KyAgICBpbXBsLT5zZXRJblZpZXdTb3VyY2VNb2RlKGVuYWJsZWQpOworCisgICAgcmV0dXJuIHRy dWU7Cit9CisKK0VpbmFfQm9vbCBld2tfdmlld19zb3VyY2VfbW9kZV9nZXQoY29uc3QgRXZhc19P YmplY3QqIGV3a1ZpZXcpCit7CisgICAgRVdLX1ZJRVdfSU1QTF9HRVRfT1JfUkVUVVJOKGV3a1Zp ZXcsIGltcGwsIGZhbHNlKTsKKworICAgIHJldHVybiBpbXBsLT5pblZpZXdTb3VyY2VNb2RlKCk7 Cit9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmll dy5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaAppbmRleCBj ZDUwNDFmYjA5NjkwMTcyODgwOTRhMjRiZjIzMzFkNWY5MWQ3MGZlLi5hZDdjMDA0MmI5ZjhkZTg4 OTE3NDk4ZjI4YWQzNmE1MjU0NTE4YzAzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZWZsL2V3a192aWV3LmgKQEAgLTg0Niw2ICs4NDYsMzAgQEAgRUFQSSBFaW5hX0Jvb2wgZXdr X3ZpZXdfZnVsbHNjcmVlbl9leGl0KEV2YXNfT2JqZWN0ICpvKTsKICAqLwogRUFQSSB2b2lkIGV3 a192aWV3X2RyYXdzX3BhZ2VfYmFja2dyb3VuZF9zZXQoRXZhc19PYmplY3QgKm8sIEVpbmFfQm9v bCBlbmFibGVkKTsKIAorLyoqCisgKiBTZXRzIHRoZSBzb3VyY2UgbW9kZSBhcyBFSU5BX1RSVUUg dG8gZGlzcGxheSB0aGUgd2ViIHNvdXJjZSBjb2RlCisgKiBvciBFSU5BX0ZBTFNFIG90aGVyd2lz ZS4gVGhlIGRlZmF1bHQgdmFsdWUgaXMgRUlOQV9GQUxTRS4KKyAqCisgKiBUaGlzIG1ldGhvZCBz aG91bGQgYmUgY2FsbGVkIGJlZm9yZSBsb2FkaW5nIG5ldyBjb250ZW50cyBvbiB3ZWIgdmlldwor ICogc28gdGhhdCB0aGUgbmV3IHZpZXcgbW9kZSB3aWxsIGJlIGFwcGxpZWQgdG8gdGhlIG5ldyBj b250ZW50cy4KKyAqCisgKiBAcGFyYW0gbyB2aWV3IG9iamVjdCB0byBzZXQgdGhlIHZpZXcgc291 cmNlIG1vZGUKKyAqIEBwYXJhbSBlbmFibGVkIGEgc3RhdGUgdG8gc2V0IHZpZXcgc291cmNlIG1v ZGUKKyAqCisgKiBAcmV0dXJuIEBjIEVJTkFfVFJVRSBvbiBzdWNjZXNzLCBvciBAYyBFSU5BX0ZB TFNFIG9uIGZhaWx1cmUKKyAqLworRUFQSSBFaW5hX0Jvb2wgZXdrX3ZpZXdfc291cmNlX21vZGVf c2V0KEV2YXNfT2JqZWN0ICpvLCBFaW5hX0Jvb2wgZW5hYmxlZCk7CisKKy8qKgorICogR2V0IHRo ZSB2aWV3IHNvdXJjZSBtb2RlIG9mIHRoZSBjdXJyZW50IHdlYiBwYWdlLgorICoKKyAqIEBwYXJh bSBvIHZpZXcgb2JqZWN0IHRvIGdldCB0aGUgdmlldyBzb3VyY2UgbW9kZQorICoKKyAqIEByZXR1 cm4gQGMgRUlOQV9UUlVFIGlmIHRoZSB2aWV3IG1vZGUgaXMgc2V0IHRvIGxvYWQgc291cmNlIGNv ZGUsIG9yCisgKiAgICAgICAgIEBjIEVJTkFfRkFMU0Ugb3RoZXJ3aXNlCisgKi8KK0VBUEkgRWlu YV9Cb29sIGV3a192aWV3X3NvdXJjZV9tb2RlX2dldChjb25zdCBFdmFzX09iamVjdCAqbyk7CisK ICNpZmRlZiBfX2NwbHVzcGx1cwogfQogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfdmlldy5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfdmlldy5jcHAKaW5kZXggMTNk N2ZhOGIzNTAzNzkzMDc3ZTJlMDZmYThjODI0OWRiOGI0ZmU5Ny4uYmJlMWM0M2M4MWM5YzU2NzYw OTNjYzQ4MmIxZmMyMTQzMGU0OTZjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX3ZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl92aWV3LmNwcApAQCAtOTE2LDMgKzkx NiwyMSBAQCBURVNUX0YoRVdLMlVuaXRUZXN0QmFzZSwgZXdrX3ZpZXdfY29udGVudHNfc2l6ZV9j aGFuZ2VkKQogCiAgICAgZXZhc19vYmplY3Rfc21hcnRfY2FsbGJhY2tfZGVsKHdlYlZpZXcoKSwg ImNvbnRlbnRzLHNpemUsY2hhbmdlZCIsIG9uQ29udGVudHNTaXplQ2hhbmdlZCk7CiB9CisKK1RF U1RfRihFV0syVW5pdFRlc3RCYXNlLCBld2tfdmlld19zb3VyY2VfbW9kZSkKK3sKKyAgICBjb25z dCBjaGFyIGluZGV4SFRNTFtdID0gIjxodG1sPjxib2R5PlRlc3QgV2ViIFZpZXcgTW9kZTxzY3Jp cHQ+ZG9jdW1lbnQudGl0bGU9d2luZG93LmRvY3VtZW50LmJvZHkuaW5uZXJUZXh0Ozwvc2NyaXB0 PjwvYm9keT48L2h0bWw+IjsKKyAgICBjb25zdCBjaGFyIGNvbnRlbnRzW10gPSAiVGVzdCBXZWIg VmlldyBNb2RlIjsKKworICAgIC8vIERlZmF1bHQgc291cmNlIG1vZGUgaXMgZmFsc2UuCisgICAg RVhQRUNUX0ZBTFNFKGV3a192aWV3X3NvdXJjZV9tb2RlX2dldCh3ZWJWaWV3KCkpKTsKKworICAg IC8vIExvYWQgd2ViIGNvbnRlbnRzIG9mIHRoZSB3ZWIgcGFnZS4KKyAgICBld2tfdmlld19odG1s X3N0cmluZ19sb2FkKHdlYlZpZXcoKSwgaW5kZXhIVE1MLCAwLCAwKTsKKyAgICBFWFBFQ1RfVFJV RSh3YWl0VW50aWxUaXRsZUNoYW5nZWRUbyhjb250ZW50cykpOworCisgICAgLy8gVE9ETzogQWRk IGEgdGVzdCBjYXNlIHdoZW4gdGhlIHNvdXJjZSBtb2RlIGlzIHRydWUuCisgICAgLy8gICAgICAg QnV0IGl0IG5lZWRzIGEgd2F5IHRvIHJldHJpZXZlIHRoZSBib2R5IGNvbnRlbnRzIHRvIGNvbXBh cmUgdGhlIGxvYWRlZCBjb250ZW50cworICAgIC8vICAgICAgIHN1Y2ggYXMgZXhjdXRpbmcgdGhl IEphdmFTY3JpcHQsICd3aW5kb3cuZG9jdW1lbnQuYm9keS5pbm5lclRleHQnLgorICAgIC8vICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDE5MDQuCit9CmRp ZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGFjZTRj NWU1NTcyMzc0NmM5NTVjNzhlZjA2N2RiMGRlNTg4MjU5MC4uNTYzZjk5NDEyNWYzMDllODdmZjVm ZTBmYWFjM2M4ZjY4ZjIyYjljYSAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rv b2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEzLTAxLTEwICBKaW53b28gU29uZyAg PGppbndvbzcuc29uZ0BzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIEFkZCBBUElz IHRvIHNldC9nZXQgdmlldyBzb3VyY2UgbW9kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA2NjMzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgYSBzaG90Y3V0ICdGOCcgaW4gTWluaWJyb3dzZXIg dG8gZGlzcGxheSBhIHNvdXJjZSBjb2RlIAorICAgICAgICBvZiB0aGUgd2ViIHBhZ2UgaW4gYSBu ZXcgd2luZG93LgorCisgICAgICAgICogTWluaUJyb3dzZXIvZWZsL21haW4uYzoKKyAgICAgICAg KG9uX2tleV9kb3duKToKKyAgICAgICAgKG9uX3dpbmRvd19jcmVhdGUpOgorICAgICAgICAod2lu ZG93X2NyZWF0ZSk6CisgICAgICAgIChlbG1fbWFpbik6CisKIDIwMTMtMDEtMTAgIFJ5b3N1a2Ug Tml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgQnVpbGQgZml4IGFmdGVyIHIxMzkz NTcuIEl0IHdhcyBtaXNzaW5nIGEgY29tbWEuCmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nl ci9lZmwvbWFpbi5jIGIvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYwppbmRleCAzZmE1Yjc1 ZWM1MDQwMDEyNDgyYmY0MmE5NGFmNDJjN2UwYzY0YjI0Li40YTg1MDMyYmZhZjhkMGE2MjJmZjRm MzA0ZjcyYzI0OGIyY2NlNGJmIDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFp bi5jCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMKQEAgLTE0MSw3ICsxNDEsNyBA QCBzdGF0aWMgY29uc3QgRWNvcmVfR2V0b3B0IG9wdGlvbnMgPSB7CiAgICAgfQogfTsKIAotc3Rh dGljIEJyb3dzZXJfV2luZG93ICp3aW5kb3dfY3JlYXRlKEV2YXNfT2JqZWN0KiBvcGVuZXIsIGNv bnN0IGNoYXIgKnVybCwgaW50IHdpZHRoLCBpbnQgaGVpZ2h0KTsKK3N0YXRpYyBCcm93c2VyX1dp bmRvdyAqd2luZG93X2NyZWF0ZShFdmFzX09iamVjdCogb3BlbmVyLCBjb25zdCBjaGFyICp1cmws IGludCB3aWR0aCwgaW50IGhlaWdodCwgRWluYV9Cb29sIHZpZXdfbW9kZSk7CiAKIHN0YXRpYyBC cm93c2VyX1dpbmRvdyAqd2luZG93X2ZpbmRfd2l0aF9lbG1fd2luZG93KEV2YXNfT2JqZWN0ICpl bG1fd2luZG93KQogewpAQCAtMjk3LDkgKzI5NywxMyBAQCBvbl9rZXlfZG93bih2b2lkICp1c2Vy X2RhdGEsIEV2YXMgKmUsIEV2YXNfT2JqZWN0ICpld2tfdmlldywgdm9pZCAqZXZlbnRfaW5mbykK ICAgICAgICAgICAgIGluZm8oIkNoYW5nZSBQYWdpbmF0aW9uIE1vZGUgKEY3KSB3YXMgcHJlc3Nl ZCwgY2hhbmdlZCB0bzogJWRcbiIsIG1vZGUpOwogICAgICAgICBlbHNlCiAgICAgICAgICAgICBp bmZvKCJDaGFuZ2UgUGFnaW5hdGlvbiBNb2RlIChGNykgd2FzIHByZXNzZWQsIGJ1dCBOT1QgY2hh bmdlZCEiKTsKKyAgICB9IGVsc2UgaWYgICghc3RyY21wKGV2LT5rZXksICJGOCIpKSB7CisgICAg ICAgIGluZm8oIkNyZWF0ZSBuZXcgd2luZG93IHRvIGRpc3BsYXkgdGhlIHNvdXJjZSBjb2RlIG9m IHRoZSBjdXJyZW50IHdlYiBwYWdlLlxuIik7CisgICAgICAgIEJyb3dzZXJfV2luZG93ICp3aW5k b3cgPSB3aW5kb3dfY3JlYXRlKGV3a192aWV3LCBld2tfdmlld191cmxfZ2V0KGV3a192aWV3KSwg MCwgMCwgRUlOQV9UUlVFKTsKKyAgICAgICAgd2luZG93cyA9IGVpbmFfbGlzdF9hcHBlbmQod2lu ZG93cywgd2luZG93KTsKICAgICB9IGVsc2UgaWYgKCFzdHJjbXAoZXYtPmtleSwgIm4iKSAmJiBj dHJsUHJlc3NlZCkgewogICAgICAgICBpbmZvKCJDcmVhdGUgbmV3IHdpbmRvdyAoQ3RybCtuKSB3 YXMgcHJlc3NlZC5cbiIpOwotICAgICAgICBCcm93c2VyX1dpbmRvdyAqd2luZG93ID0gd2luZG93 X2NyZWF0ZSgwLCBERUZBVUxUX1VSTCwgMCwgMCk7CisgICAgICAgIEJyb3dzZXJfV2luZG93ICp3 aW5kb3cgPSB3aW5kb3dfY3JlYXRlKDAsIERFRkFVTFRfVVJMLCAwLCAwLCBFSU5BX0ZBTFNFKTsK ICAgICAgICAgLy8gMCBlcXVhbHMgZGVmYXVsdCB3aWR0aCBhbmQgaGVpZ2h0LgogICAgICAgICB3 aW5kb3dzID0gZWluYV9saXN0X2FwcGVuZCh3aW5kb3dzLCB3aW5kb3cpOwogICAgIH0gZWxzZSBp ZiAoIXN0cmNtcChldi0+a2V5LCAiaSIpICYmIGN0cmxQcmVzc2VkKSB7CkBAIC04NzksNyArODgz LDcgQEAgb25fd2luZG93X2NyZWF0ZShFd2tfVmlld19TbWFydF9EYXRhICpzbWFydERhdGEsIGNv bnN0IGNoYXIgKnVybCwgY29uc3QgRXdrX1dpbmQKICAgICBpZiAoIWhlaWdodCkKICAgICAgICAg aGVpZ2h0ID0gd2luZG93X2hlaWdodDsKIAotICAgIEJyb3dzZXJfV2luZG93ICp3aW5kb3cgPSB3 aW5kb3dfY3JlYXRlKHNtYXJ0RGF0YS0+c2VsZiwgdXJsLCB3aWR0aCwgaGVpZ2h0KTsKKyAgICBC cm93c2VyX1dpbmRvdyAqd2luZG93ID0gd2luZG93X2NyZWF0ZShzbWFydERhdGEtPnNlbGYsIHVy bCwgd2lkdGgsIGhlaWdodCwgRUlOQV9GQUxTRSk7CiAgICAgRXZhc19PYmplY3QgKm5ld192aWV3 ID0gd2luZG93LT5ld2tfdmlldzsKIAogICAgIHdpbmRvd3MgPSBlaW5hX2xpc3RfYXBwZW5kKHdp bmRvd3MsIHdpbmRvdyk7CkBAIC0xMDc0LDcgKzEwNzgsNyBAQCBjcmVhdGVfdG9vbGJhcl9idXR0 b24oRXZhc19PYmplY3QgKmVsbV93aW5kb3csIGNvbnN0IGNoYXIgKmljb25fbmFtZSkKICAgICBy ZXR1cm4gYnV0dG9uOwogfQogCi1zdGF0aWMgQnJvd3Nlcl9XaW5kb3cgKndpbmRvd19jcmVhdGUo RXZhc19PYmplY3QgKm9wZW5lciwgY29uc3QgY2hhciAqdXJsLCBpbnQgd2lkdGgsIGludCBoZWln aHQpCitzdGF0aWMgQnJvd3Nlcl9XaW5kb3cgKndpbmRvd19jcmVhdGUoRXZhc19PYmplY3QgKm9w ZW5lciwgY29uc3QgY2hhciAqdXJsLCBpbnQgd2lkdGgsIGludCBoZWlnaHQsIEVpbmFfQm9vbCB2 aWV3X21vZGUpCiB7CiAgICAgQnJvd3Nlcl9XaW5kb3cgKndpbmRvdyA9IG1hbGxvYyhzaXplb2Yo QnJvd3Nlcl9XaW5kb3cpKTsKICAgICBpZiAoIXdpbmRvdykgewpAQCAtMTE4Nyw2ICsxMTkxLDcg QEAgc3RhdGljIEJyb3dzZXJfV2luZG93ICp3aW5kb3dfY3JlYXRlKEV2YXNfT2JqZWN0ICpvcGVu ZXIsIGNvbnN0IGNoYXIgKnVybCwgaW50IHcKICAgICBld2tfdmlld190aGVtZV9zZXQod2luZG93 LT5ld2tfdmlldywgVEhFTUVfRElSICIvZGVmYXVsdC5lZGoiKTsKICAgICBpZiAoZGV2aWNlX3Bp eGVsX3JhdGlvKQogICAgICAgICBld2tfdmlld19kZXZpY2VfcGl4ZWxfcmF0aW9fc2V0KHdpbmRv dy0+ZXdrX3ZpZXcsIChmbG9hdClkZXZpY2VfcGl4ZWxfcmF0aW8pOworICAgIGV3a192aWV3X3Nv dXJjZV9tb2RlX3NldCh3aW5kb3ctPmV3a192aWV3LCB2aWV3X21vZGUpOwogCiAgICAgLyogU2V0 IHRoZSB6b29tIGxldmVsIHRvIGRlZmF1bHQgKi8KICAgICB3aW5kb3ctPmN1cnJlbnRfem9vbV9s ZXZlbCA9IERFRkFVTFRfWk9PTV9MRVZFTDsKQEAgLTEzMTcsMTAgKzEzMjIsMTAgQEAgZWxtX21h aW4oaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKIAogICAgIGlmIChhcmdzIDwgYXJnYykgewogICAg ICAgICBjaGFyICp1cmwgPSB1cmxfZnJvbV91c2VyX2lucHV0KGFyZ3ZbYXJnc10pOwotICAgICAg ICB3aW5kb3cgPSB3aW5kb3dfY3JlYXRlKDAsIHVybCwgMCwgMCk7CisgICAgICAgIHdpbmRvdyA9 IHdpbmRvd19jcmVhdGUoMCwgdXJsLCAwLCAwLCBFSU5BX0ZBTFNFKTsKICAgICAgICAgZnJlZSh1 cmwpOwogICAgIH0gZWxzZQotICAgICAgICB3aW5kb3cgPSB3aW5kb3dfY3JlYXRlKDAsIERFRkFV TFRfVVJMLCAwLCAwKTsKKyAgICAgICAgd2luZG93ID0gd2luZG93X2NyZWF0ZSgwLCBERUZBVUxU X1VSTCwgMCwgMCwgRUlOQV9GQUxTRSk7CiAKICAgICBpZiAoIXdpbmRvdykKICAgICAgICAgcmV0 dXJuIHF1aXQoRUlOQV9GQUxTRSwgIkVSUk9SOiBjb3VsZCBub3QgY3JlYXRlIGJyb3dzZXIgd2lu ZG93LlxuIik7Cg== 182720 2013-01-15 01:49:36 -0800 2013-01-15 02:31:08 -0800 Patch bug-106633-20130115184635.patch text/plain 11037 jinwoo7.song U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5NzA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYWMxMTZmNGU2YzA2MjQw ZWZmOWI2ZTc1M2E1MTYzMTg4OTdiZWZhMy4uMDE0OTUzMTFmZGEzYTM3OTk3MTcxN2M4MTNkOGY1 MzY0NDM3YTM0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEzLTAxLTE1ICBKaW53 b28gU29uZyAgPGppbndvbzcuc29uZ0BzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJd IEFkZCBBUElzIHRvIHNldC9nZXQgdmlldyBzb3VyY2UgbW9kZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA2NjMzCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgQVBJcyB0byBzZXQvZ2V0IHZpZXcg c291cmNlIG1vZGUgZm9yIGVuYWJsaW5nIHRvIGxvYWQKKyAgICAgICAgdGhlIHNvdXJjZSBjb2Rl IG9mIHRoZSB3ZWIgcGFnZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3 LmNwcDoKKyAgICAgICAgKGV3a192aWV3X3NvdXJjZV9tb2RlX3NldCk6CisgICAgICAgIChld2tf dmlld19zb3VyY2VfbW9kZV9nZXQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a192 aWV3Lmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX3ZpZXcu Y3BwOgorICAgICAgICAoVEVTVF9GKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpXZWJQYWdlUHJveHkpOgorICAg ICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnNldE1haW5GcmFtZUluVmlld1NvdXJjZU1vZGUp OgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKFdlYktpdDo6 V2ViUGFnZVByb3h5OjptYWluRnJhbWVJblZpZXdTb3VyY2VNb2RlKToKKyAgICAgICAgKFdlYlBh Z2VQcm94eSk6CisKIDIwMTMtMDEtMTQgIERlYW4gSmFja3NvbiAgPGRpbm9AYXBwbGUuY29tPgog CiAgICAgICAgIFtBTkdMRV0gVXBkYXRlIEFOR0xFIGluIFdlYktpdApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwCmluZGV4IGVmNTIxM2VmMWE0YWQ2ZTFj ZWZmODdiNzZmNzQyNzI3NTFkNzgzMDQuLjU4NWI1YTIzM2UzNTQ1MzVlNTAzZTllODllOGNjNDM1 OTczOWUzNjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3 a192aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmll dy5jcHAKQEAgLTk4MywzICs5ODMsMTkgQEAgRWluYV9Cb29sIGV3a192aWV3X3BhZ2VfY29udGVu dHNfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0KiBld2tWaWV3LCBFd2tfUGFnZV9Db250ZW4KIAogICAg IHJldHVybiB0cnVlOwogfQorCitFaW5hX0Jvb2wgZXdrX3ZpZXdfc291cmNlX21vZGVfc2V0KEV2 YXNfT2JqZWN0KiBld2tWaWV3LCBFaW5hX0Jvb2wgZW5hYmxlZCkKK3sKKyAgICBFV0tfVklFV19J TVBMX0dFVF9PUl9SRVRVUk4oZXdrVmlldywgaW1wbCwgZmFsc2UpOworCisgICAgaW1wbC0+cGFn ZSgpLT5zZXRNYWluRnJhbWVJblZpZXdTb3VyY2VNb2RlKGVuYWJsZWQpOworCisgICAgcmV0dXJu IHRydWU7Cit9CisKK0VpbmFfQm9vbCBld2tfdmlld19zb3VyY2VfbW9kZV9nZXQoY29uc3QgRXZh c19PYmplY3QqIGV3a1ZpZXcpCit7CisgICAgRVdLX1ZJRVdfSU1QTF9HRVRfT1JfUkVUVVJOKGV3 a1ZpZXcsIGltcGwsIGZhbHNlKTsKKworICAgIHJldHVybiBpbXBsLT5wYWdlKCktPm1haW5GcmFt ZUluVmlld1NvdXJjZU1vZGUoKTsKK30KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL2V3a192aWV3LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2Vm bC9ld2tfdmlldy5oCmluZGV4IGIyZmY2NWE5NWRkOWY1MmU0OTlkYmJmMGRlNmFlMmM3ZTlmZWUw M2UuLjczNjRkODFjODAxMTZjZWJiZTlkYWI5YWIwNDdjMzhhNDY0OWMyNzggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmgKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaApAQCAtODcwLDYgKzg3MCwzMCBA QCBFQVBJIHZvaWQgZXdrX3ZpZXdfZHJhd3NfcGFnZV9iYWNrZ3JvdW5kX3NldChFdmFzX09iamVj dCAqbywgRWluYV9Cb29sIGVuYWJsZWQpOwogICovCiBFQVBJIEVpbmFfQm9vbCBld2tfdmlld19w YWdlX2NvbnRlbnRzX2dldChjb25zdCBFdmFzX09iamVjdCAqbywgRXdrX1BhZ2VfQ29udGVudHNf VHlwZSB0eXBlLCBFd2tfUGFnZV9Db250ZW50c19DYiBjYWxsYmFjayk7CiAKKy8qKgorICogU2V0 cyB0aGUgc291cmNlIG1vZGUgYXMgRUlOQV9UUlVFIHRvIGRpc3BsYXkgdGhlIHdlYiBzb3VyY2Ug Y29kZQorICogb3IgRUlOQV9GQUxTRSBvdGhlcndpc2UuIFRoZSBkZWZhdWx0IHZhbHVlIGlzIEVJ TkFfRkFMU0UuCisgKgorICogVGhpcyBtZXRob2Qgc2hvdWxkIGJlIGNhbGxlZCBiZWZvcmUgbG9h ZGluZyBuZXcgY29udGVudHMgb24gd2ViIHZpZXcKKyAqIHNvIHRoYXQgdGhlIG5ldyB2aWV3IG1v ZGUgd2lsbCBiZSBhcHBsaWVkIHRvIHRoZSBuZXcgY29udGVudHMuCisgKgorICogQHBhcmFtIG8g dmlldyBvYmplY3QgdG8gc2V0IHRoZSB2aWV3IHNvdXJjZSBtb2RlCisgKiBAcGFyYW0gZW5hYmxl ZCBhIHN0YXRlIHRvIHNldCB2aWV3IHNvdXJjZSBtb2RlCisgKgorICogQHJldHVybiBAYyBFSU5B X1RSVUUgb24gc3VjY2Vzcywgb3IgQGMgRUlOQV9GQUxTRSBvbiBmYWlsdXJlCisgKi8KK0VBUEkg RWluYV9Cb29sIGV3a192aWV3X3NvdXJjZV9tb2RlX3NldChFdmFzX09iamVjdCAqbywgRWluYV9C b29sIGVuYWJsZWQpOworCisvKioKKyAqIEdldCB0aGUgdmlldyBzb3VyY2UgbW9kZSBvZiB0aGUg Y3VycmVudCB3ZWIgcGFnZS4KKyAqCisgKiBAcGFyYW0gbyB2aWV3IG9iamVjdCB0byBnZXQgdGhl IHZpZXcgc291cmNlIG1vZGUKKyAqCisgKiBAcmV0dXJuIEBjIEVJTkFfVFJVRSBpZiB0aGUgdmll dyBtb2RlIGlzIHNldCB0byBsb2FkIHNvdXJjZSBjb2RlLCBvcgorICogICAgICAgICBAYyBFSU5B X0ZBTFNFIG90aGVyd2lzZQorICovCitFQVBJIEVpbmFfQm9vbCBld2tfdmlld19zb3VyY2VfbW9k ZV9nZXQoY29uc3QgRXZhc19PYmplY3QgKm8pOworCiAjaWZkZWYgX19jcGx1c3BsdXMKIH0KICNl bmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMv dGVzdF9ld2syX3ZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVz dHMvdGVzdF9ld2syX3ZpZXcuY3BwCmluZGV4IGIzNTA4ZDRhZDU1YTEwN2NiMmVjZDMyNTIwMjYx YzJkNmIwOGVhM2IuLmIzNzlmYTA5YTkxMzczYWFjZWQ1M2NkZjQ2MDhlNWU4MmI0MmRjOTIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdr Ml92aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90 ZXN0X2V3azJfdmlldy5jcHAKQEAgLTk0NSwzICs5NDUsMjEgQEAgVEVTVF9GKEVXSzJVbml0VGVz dEJhc2UsIGV3a192aWV3X3BhZ2VfY29udGVudHNfZ2V0KQogICAgIHdoaWxlICghaXNPYnRhaW5l ZFBhZ2VDb250ZW50cykKICAgICAgICAgZWNvcmVfbWFpbl9sb29wX2l0ZXJhdGUoKTsKIH0KKwor VEVTVF9GKEVXSzJVbml0VGVzdEJhc2UsIGV3a192aWV3X3NvdXJjZV9tb2RlKQoreworICAgIGNv bnN0IGNoYXIgaW5kZXhIVE1MW10gPSAiPGh0bWw+PGJvZHk+VGVzdCBXZWIgVmlldyBNb2RlPHNj cmlwdD5kb2N1bWVudC50aXRsZT13aW5kb3cuZG9jdW1lbnQuYm9keS5pbm5lclRleHQ7PC9zY3Jp cHQ+PC9ib2R5PjwvaHRtbD4iOworICAgIGNvbnN0IGNoYXIgY29udGVudHNbXSA9ICJUZXN0IFdl YiBWaWV3IE1vZGUiOworCisgICAgLy8gRGVmYXVsdCBzb3VyY2UgbW9kZSBpcyBmYWxzZS4KKyAg ICBFWFBFQ1RfRkFMU0UoZXdrX3ZpZXdfc291cmNlX21vZGVfZ2V0KHdlYlZpZXcoKSkpOworCisg ICAgLy8gTG9hZCB3ZWIgY29udGVudHMgb2YgdGhlIHdlYiBwYWdlLgorICAgIGV3a192aWV3X2h0 bWxfc3RyaW5nX2xvYWQod2ViVmlldygpLCBpbmRleEhUTUwsIDAsIDApOworICAgIEVYUEVDVF9U UlVFKHdhaXRVbnRpbFRpdGxlQ2hhbmdlZFRvKGNvbnRlbnRzKSk7CisKKyAgICAvLyBUT0RPOiBB ZGQgYSB0ZXN0IGNhc2Ugd2hlbiB0aGUgc291cmNlIG1vZGUgaXMgdHJ1ZS4KKyAgICAvLyAgICAg ICBCdXQgaXQgbmVlZHMgYSB3YXkgdG8gcmV0cmlldmUgdGhlIGJvZHkgY29udGVudHMgdG8gY29t cGFyZSB0aGUgbG9hZGVkIGNvbnRlbnRzCisgICAgLy8gICAgICAgc3VjaCBhcyBleGN1dGluZyB0 aGUgSmF2YVNjcmlwdCwgJ3dpbmRvdy5kb2N1bWVudC5ib2R5LmlubmVyVGV4dCcuCisgICAgLy8g ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMTkwNC4KK30K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggMTZlMWM3YjE1 NTEyMzZkMjc1OThjMjBhNTVjMjVlM2EzYjhiZWZiMy4uMDFlYzNiMjE3OGNmOWE5M2QzZjAzZjY3 ZGJhMzAxZjA5OTg1OTUyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5jcHAKQEAgLTIzNyw2ICsyMzcsNyBAQCBXZWJQYWdlUHJveHk6OldlYlBhZ2VQcm94eShQYWdl Q2xpZW50KiBwYWdlQ2xpZW50LCBQYXNzUmVmUHRyPFdlYlByb2Nlc3NQcm94eT4gcAogICAgICwg bV9taW5pbXVtTGF5b3V0V2lkdGgoMCkKICAgICAsIG1fbWVkaWFWb2x1bWUoMSkKICAgICAsIG1f bWF5U3RhcnRNZWRpYVdoZW5JbldpbmRvdyh0cnVlKQorICAgICwgbV9tYWluRnJhbWVJblZpZXdT b3VyY2VNb2RlKGZhbHNlKQogI2lmIEVOQUJMRShQQUdFX1ZJU0lCSUxJVFlfQVBJKQogICAgICwg bV92aXNpYmlsaXR5U3RhdGUoUGFnZVZpc2liaWxpdHlTdGF0ZVZpc2libGUpCiAjZW5kaWYKQEAg LTQyNjMsOSArNDI2NCwxNSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6Y2FuY2VsQ29tcG9zaXRpb24o KQogfQogI2VuZGlmIC8vIFBMQVRGT1JNKFFUKSB8fCBQTEFURk9STShHVEspCiAKLXZvaWQgV2Vi UGFnZVByb3h5OjpzZXRNYWluRnJhbWVJblZpZXdTb3VyY2VNb2RlKGJvb2wgaW5WaWV3U291cmNl TW9kZSkKK3ZvaWQgV2ViUGFnZVByb3h5OjpzZXRNYWluRnJhbWVJblZpZXdTb3VyY2VNb2RlKGJv b2wgbWFpbkZyYW1lSW5WaWV3U291cmNlTW9kZSkKIHsKLSAgICBtX3Byb2Nlc3MtPnNlbmQoTWVz c2FnZXM6OldlYlBhZ2U6OlNldE1haW5GcmFtZUluVmlld1NvdXJjZU1vZGUoaW5WaWV3U291cmNl TW9kZSksIG1fcGFnZUlEKTsKKyAgICBpZiAobV9tYWluRnJhbWVJblZpZXdTb3VyY2VNb2RlID09 IG1haW5GcmFtZUluVmlld1NvdXJjZU1vZGUpCisgICAgICAgIHJldHVybjsKKworICAgIG1fbWFp bkZyYW1lSW5WaWV3U291cmNlTW9kZSA9IG1haW5GcmFtZUluVmlld1NvdXJjZU1vZGU7CisKKyAg ICBpZiAoaXNWYWxpZCgpKQorICAgICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBh Z2U6OlNldE1haW5GcmFtZUluVmlld1NvdXJjZU1vZGUobWFpbkZyYW1lSW5WaWV3U291cmNlTW9k ZSksIG1fcGFnZUlEKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKaW5kZXggNmVhZjJmZjhlNjQ1NjU3MDIyY2VlYzc5Nzlm MjJiZGMzOGJkNDVhMC4uZDJmZTNiOTJmOTliNzg2MDk1YWVlZTZkYmQ1YmVmMjlhNjNlMWQ3MCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaApAQCAtNzQ4LDYgKzc0OCw3 IEBAIHB1YmxpYzoKICAgICBkb3VibGUgbWluaW11bUxheW91dFdpZHRoKCkgY29uc3QgeyByZXR1 cm4gbV9taW5pbXVtTGF5b3V0V2lkdGg7IH0KICAgICB2b2lkIHNldE1pbmltdW1MYXlvdXRXaWR0 aChkb3VibGUpOwogCisgICAgYm9vbCBtYWluRnJhbWVJblZpZXdTb3VyY2VNb2RlKCkgY29uc3Qg eyByZXR1cm4gbV9tYWluRnJhbWVJblZpZXdTb3VyY2VNb2RlOyB9CiAgICAgdm9pZCBzZXRNYWlu RnJhbWVJblZpZXdTb3VyY2VNb2RlKGJvb2wpOwogCiBwcml2YXRlOgpAQCAtMTIzMiw2ICsxMjMz LDggQEAgcHJpdmF0ZToKICAgICBmbG9hdCBtX21lZGlhVm9sdW1lOwogICAgIGJvb2wgbV9tYXlT dGFydE1lZGlhV2hlbkluV2luZG93OwogCisgICAgYm9vbCBtX21haW5GcmFtZUluVmlld1NvdXJj ZU1vZGU7CisKICNpZiBQTEFURk9STShRVCkKICAgICBXVEY6Okhhc2hTZXQ8UmVmUHRyPFF0UmVm Q291bnRlZE5ldHdvcmtSZXF1ZXN0RGF0YT4gPiBtX2FwcGxpY2F0aW9uU2NoZW1lUmVxdWVzdHM7 CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwpp bmRleCBhMjA3ZjBjOGUzZTcxNjMzNGQ3NTE0YmYyNmRmZTQ4NzE1ZGY3ODg0Li4wOTM0NTc1ZjVm YTVlMWU2YzUwNTc3OWRjOTViMjExNDgzMDUxMTI0IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VM b2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTMtMDEtMTUgIEpp bndvbyBTb25nICA8amlud29vNy5zb25nQHNhbXN1bmcuY29tPgorCisgICAgICAgIFtFRkxdW1dL Ml0gQWRkIEFQSXMgdG8gc2V0L2dldCB2aWV3IHNvdXJjZSBtb2RlCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDY2MzMKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRlZCBhIHNob3RjdXQgJ0Y4JyBpbiBN aW5pYnJvd3NlciB0byBkaXNwbGF5IGEgc291cmNlIGNvZGUKKyAgICAgICAgb2YgdGhlIHdlYiBw YWdlIGluIGEgbmV3IHdpbmRvdy4KKworICAgICAgICogTWluaUJyb3dzZXIvZWZsL21haW4uYzoK KyAgICAgICAgKG9uX2tleV9kb3duKToKKyAgICAgICAgKG9uX3dpbmRvd19jcmVhdGUpOgorICAg ICAgICAod2luZG93X2NyZWF0ZSk6CisgICAgICAgIChlbG1fbWFpbik6CisKIDIwMTMtMDEtMTQg IEFsYW4gQ3V0dGVyICA8YWxhbmN1dHRlckBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgRml4IEVX UyBHQ0UgYnVpbGQgc2NyaXB0cyB0byBkZXRlY3Qgd2hpY2ggem9uZSBpcyBhdmFpbGFibGUKZGlm ZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMgYi9Ub29scy9NaW5pQnJvd3Nl ci9lZmwvbWFpbi5jCmluZGV4IDNmYTViNzVlYzUwNDAwMTI0ODJiZjQyYTk0YWY0MmM3ZTBjNjRi MjQuLjRhODUwMzJiZmFmOGQwYTYyMmZmNGYzMDRmNzJjMjQ4YjJjY2U0YmYgMTAwNjQ0Ci0tLSBh L1Rvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvZWZs L21haW4uYwpAQCAtMTQxLDcgKzE0MSw3IEBAIHN0YXRpYyBjb25zdCBFY29yZV9HZXRvcHQgb3B0 aW9ucyA9IHsKICAgICB9CiB9OwogCi1zdGF0aWMgQnJvd3Nlcl9XaW5kb3cgKndpbmRvd19jcmVh dGUoRXZhc19PYmplY3QqIG9wZW5lciwgY29uc3QgY2hhciAqdXJsLCBpbnQgd2lkdGgsIGludCBo ZWlnaHQpOworc3RhdGljIEJyb3dzZXJfV2luZG93ICp3aW5kb3dfY3JlYXRlKEV2YXNfT2JqZWN0 KiBvcGVuZXIsIGNvbnN0IGNoYXIgKnVybCwgaW50IHdpZHRoLCBpbnQgaGVpZ2h0LCBFaW5hX0Jv b2wgdmlld19tb2RlKTsKIAogc3RhdGljIEJyb3dzZXJfV2luZG93ICp3aW5kb3dfZmluZF93aXRo X2VsbV93aW5kb3coRXZhc19PYmplY3QgKmVsbV93aW5kb3cpCiB7CkBAIC0yOTcsOSArMjk3LDEz IEBAIG9uX2tleV9kb3duKHZvaWQgKnVzZXJfZGF0YSwgRXZhcyAqZSwgRXZhc19PYmplY3QgKmV3 a192aWV3LCB2b2lkICpldmVudF9pbmZvKQogICAgICAgICAgICAgaW5mbygiQ2hhbmdlIFBhZ2lu YXRpb24gTW9kZSAoRjcpIHdhcyBwcmVzc2VkLCBjaGFuZ2VkIHRvOiAlZFxuIiwgbW9kZSk7CiAg ICAgICAgIGVsc2UKICAgICAgICAgICAgIGluZm8oIkNoYW5nZSBQYWdpbmF0aW9uIE1vZGUgKEY3 KSB3YXMgcHJlc3NlZCwgYnV0IE5PVCBjaGFuZ2VkISIpOworICAgIH0gZWxzZSBpZiAgKCFzdHJj bXAoZXYtPmtleSwgIkY4IikpIHsKKyAgICAgICAgaW5mbygiQ3JlYXRlIG5ldyB3aW5kb3cgdG8g ZGlzcGxheSB0aGUgc291cmNlIGNvZGUgb2YgdGhlIGN1cnJlbnQgd2ViIHBhZ2UuXG4iKTsKKyAg ICAgICAgQnJvd3Nlcl9XaW5kb3cgKndpbmRvdyA9IHdpbmRvd19jcmVhdGUoZXdrX3ZpZXcsIGV3 a192aWV3X3VybF9nZXQoZXdrX3ZpZXcpLCAwLCAwLCBFSU5BX1RSVUUpOworICAgICAgICB3aW5k b3dzID0gZWluYV9saXN0X2FwcGVuZCh3aW5kb3dzLCB3aW5kb3cpOwogICAgIH0gZWxzZSBpZiAo IXN0cmNtcChldi0+a2V5LCAibiIpICYmIGN0cmxQcmVzc2VkKSB7CiAgICAgICAgIGluZm8oIkNy ZWF0ZSBuZXcgd2luZG93IChDdHJsK24pIHdhcyBwcmVzc2VkLlxuIik7Ci0gICAgICAgIEJyb3dz ZXJfV2luZG93ICp3aW5kb3cgPSB3aW5kb3dfY3JlYXRlKDAsIERFRkFVTFRfVVJMLCAwLCAwKTsK KyAgICAgICAgQnJvd3Nlcl9XaW5kb3cgKndpbmRvdyA9IHdpbmRvd19jcmVhdGUoMCwgREVGQVVM VF9VUkwsIDAsIDAsIEVJTkFfRkFMU0UpOwogICAgICAgICAvLyAwIGVxdWFscyBkZWZhdWx0IHdp ZHRoIGFuZCBoZWlnaHQuCiAgICAgICAgIHdpbmRvd3MgPSBlaW5hX2xpc3RfYXBwZW5kKHdpbmRv d3MsIHdpbmRvdyk7CiAgICAgfSBlbHNlIGlmICghc3RyY21wKGV2LT5rZXksICJpIikgJiYgY3Ry bFByZXNzZWQpIHsKQEAgLTg3OSw3ICs4ODMsNyBAQCBvbl93aW5kb3dfY3JlYXRlKEV3a19WaWV3 X1NtYXJ0X0RhdGEgKnNtYXJ0RGF0YSwgY29uc3QgY2hhciAqdXJsLCBjb25zdCBFd2tfV2luZAog ICAgIGlmICghaGVpZ2h0KQogICAgICAgICBoZWlnaHQgPSB3aW5kb3dfaGVpZ2h0OwogCi0gICAg QnJvd3Nlcl9XaW5kb3cgKndpbmRvdyA9IHdpbmRvd19jcmVhdGUoc21hcnREYXRhLT5zZWxmLCB1 cmwsIHdpZHRoLCBoZWlnaHQpOworICAgIEJyb3dzZXJfV2luZG93ICp3aW5kb3cgPSB3aW5kb3df Y3JlYXRlKHNtYXJ0RGF0YS0+c2VsZiwgdXJsLCB3aWR0aCwgaGVpZ2h0LCBFSU5BX0ZBTFNFKTsK ICAgICBFdmFzX09iamVjdCAqbmV3X3ZpZXcgPSB3aW5kb3ctPmV3a192aWV3OwogCiAgICAgd2lu ZG93cyA9IGVpbmFfbGlzdF9hcHBlbmQod2luZG93cywgd2luZG93KTsKQEAgLTEwNzQsNyArMTA3 OCw3IEBAIGNyZWF0ZV90b29sYmFyX2J1dHRvbihFdmFzX09iamVjdCAqZWxtX3dpbmRvdywgY29u c3QgY2hhciAqaWNvbl9uYW1lKQogICAgIHJldHVybiBidXR0b247CiB9CiAKLXN0YXRpYyBCcm93 c2VyX1dpbmRvdyAqd2luZG93X2NyZWF0ZShFdmFzX09iamVjdCAqb3BlbmVyLCBjb25zdCBjaGFy ICp1cmwsIGludCB3aWR0aCwgaW50IGhlaWdodCkKK3N0YXRpYyBCcm93c2VyX1dpbmRvdyAqd2lu ZG93X2NyZWF0ZShFdmFzX09iamVjdCAqb3BlbmVyLCBjb25zdCBjaGFyICp1cmwsIGludCB3aWR0 aCwgaW50IGhlaWdodCwgRWluYV9Cb29sIHZpZXdfbW9kZSkKIHsKICAgICBCcm93c2VyX1dpbmRv dyAqd2luZG93ID0gbWFsbG9jKHNpemVvZihCcm93c2VyX1dpbmRvdykpOwogICAgIGlmICghd2lu ZG93KSB7CkBAIC0xMTg3LDYgKzExOTEsNyBAQCBzdGF0aWMgQnJvd3Nlcl9XaW5kb3cgKndpbmRv d19jcmVhdGUoRXZhc19PYmplY3QgKm9wZW5lciwgY29uc3QgY2hhciAqdXJsLCBpbnQgdwogICAg IGV3a192aWV3X3RoZW1lX3NldCh3aW5kb3ctPmV3a192aWV3LCBUSEVNRV9ESVIgIi9kZWZhdWx0 LmVkaiIpOwogICAgIGlmIChkZXZpY2VfcGl4ZWxfcmF0aW8pCiAgICAgICAgIGV3a192aWV3X2Rl dmljZV9waXhlbF9yYXRpb19zZXQod2luZG93LT5ld2tfdmlldywgKGZsb2F0KWRldmljZV9waXhl bF9yYXRpbyk7CisgICAgZXdrX3ZpZXdfc291cmNlX21vZGVfc2V0KHdpbmRvdy0+ZXdrX3ZpZXcs IHZpZXdfbW9kZSk7CiAKICAgICAvKiBTZXQgdGhlIHpvb20gbGV2ZWwgdG8gZGVmYXVsdCAqLwog ICAgIHdpbmRvdy0+Y3VycmVudF96b29tX2xldmVsID0gREVGQVVMVF9aT09NX0xFVkVMOwpAQCAt MTMxNywxMCArMTMyMiwxMCBAQCBlbG1fbWFpbihpbnQgYXJnYywgY2hhciAqYXJndltdKQogCiAg ICAgaWYgKGFyZ3MgPCBhcmdjKSB7CiAgICAgICAgIGNoYXIgKnVybCA9IHVybF9mcm9tX3VzZXJf aW5wdXQoYXJndlthcmdzXSk7Ci0gICAgICAgIHdpbmRvdyA9IHdpbmRvd19jcmVhdGUoMCwgdXJs LCAwLCAwKTsKKyAgICAgICAgd2luZG93ID0gd2luZG93X2NyZWF0ZSgwLCB1cmwsIDAsIDAsIEVJ TkFfRkFMU0UpOwogICAgICAgICBmcmVlKHVybCk7CiAgICAgfSBlbHNlCi0gICAgICAgIHdpbmRv dyA9IHdpbmRvd19jcmVhdGUoMCwgREVGQVVMVF9VUkwsIDAsIDApOworICAgICAgICB3aW5kb3cg PSB3aW5kb3dfY3JlYXRlKDAsIERFRkFVTFRfVVJMLCAwLCAwLCBFSU5BX0ZBTFNFKTsKIAogICAg IGlmICghd2luZG93KQogICAgICAgICByZXR1cm4gcXVpdChFSU5BX0ZBTFNFLCAiRVJST1I6IGNv dWxkIG5vdCBjcmVhdGUgYnJvd3NlciB3aW5kb3cuXG4iKTsK 182727 2013-01-15 02:31:15 -0800 2013-01-16 00:23:36 -0800 Patch bug-106633-20130115192814.patch text/plain 11433 jinwoo7.song U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5NzA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYWMxMTZmNGU2YzA2MjQw ZWZmOWI2ZTc1M2E1MTYzMTg4OTdiZWZhMy4uMDE0OTUzMTFmZGEzYTM3OTk3MTcxN2M4MTNkOGY1 MzY0NDM3YTM0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEzLTAxLTE1ICBKaW53 b28gU29uZyAgPGppbndvbzcuc29uZ0BzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJd IEFkZCBBUElzIHRvIHNldC9nZXQgdmlldyBzb3VyY2UgbW9kZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA2NjMzCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgQVBJcyB0byBzZXQvZ2V0IHZpZXcg c291cmNlIG1vZGUgZm9yIGVuYWJsaW5nIHRvIGxvYWQKKyAgICAgICAgdGhlIHNvdXJjZSBjb2Rl IG9mIHRoZSB3ZWIgcGFnZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3 LmNwcDoKKyAgICAgICAgKGV3a192aWV3X3NvdXJjZV9tb2RlX3NldCk6CisgICAgICAgIChld2tf dmlld19zb3VyY2VfbW9kZV9nZXQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a192 aWV3Lmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX3ZpZXcu Y3BwOgorICAgICAgICAoVEVTVF9GKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpXZWJQYWdlUHJveHkpOgorICAg ICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnNldE1haW5GcmFtZUluVmlld1NvdXJjZU1vZGUp OgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKFdlYktpdDo6 V2ViUGFnZVByb3h5OjptYWluRnJhbWVJblZpZXdTb3VyY2VNb2RlKToKKyAgICAgICAgKFdlYlBh Z2VQcm94eSk6CisKIDIwMTMtMDEtMTQgIERlYW4gSmFja3NvbiAgPGRpbm9AYXBwbGUuY29tPgog CiAgICAgICAgIFtBTkdMRV0gVXBkYXRlIEFOR0xFIGluIFdlYktpdApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwCmluZGV4IGVmNTIxM2VmMWE0YWQ2ZTFj ZWZmODdiNzZmNzQyNzI3NTFkNzgzMDQuLjU4NWI1YTIzM2UzNTQ1MzVlNTAzZTllODllOGNjNDM1 OTczOWUzNjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3 a192aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmll dy5jcHAKQEAgLTk4MywzICs5ODMsMTkgQEAgRWluYV9Cb29sIGV3a192aWV3X3BhZ2VfY29udGVu dHNfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0KiBld2tWaWV3LCBFd2tfUGFnZV9Db250ZW4KIAogICAg IHJldHVybiB0cnVlOwogfQorCitFaW5hX0Jvb2wgZXdrX3ZpZXdfc291cmNlX21vZGVfc2V0KEV2 YXNfT2JqZWN0KiBld2tWaWV3LCBFaW5hX0Jvb2wgZW5hYmxlZCkKK3sKKyAgICBFV0tfVklFV19J TVBMX0dFVF9PUl9SRVRVUk4oZXdrVmlldywgaW1wbCwgZmFsc2UpOworCisgICAgaW1wbC0+cGFn ZSgpLT5zZXRNYWluRnJhbWVJblZpZXdTb3VyY2VNb2RlKGVuYWJsZWQpOworCisgICAgcmV0dXJu IHRydWU7Cit9CisKK0VpbmFfQm9vbCBld2tfdmlld19zb3VyY2VfbW9kZV9nZXQoY29uc3QgRXZh c19PYmplY3QqIGV3a1ZpZXcpCit7CisgICAgRVdLX1ZJRVdfSU1QTF9HRVRfT1JfUkVUVVJOKGV3 a1ZpZXcsIGltcGwsIGZhbHNlKTsKKworICAgIHJldHVybiBpbXBsLT5wYWdlKCktPm1haW5GcmFt ZUluVmlld1NvdXJjZU1vZGUoKTsKK30KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL2V3a192aWV3LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2Vm bC9ld2tfdmlldy5oCmluZGV4IGIyZmY2NWE5NWRkOWY1MmU0OTlkYmJmMGRlNmFlMmM3ZTlmZWUw M2UuLjJhZWI3YTczNzY5YjYyM2MwYjU3OWFmYTJmNDE2NmUzMGI4NzUzYzQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmgKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaApAQCAtODcwLDYgKzg3MCwzMCBA QCBFQVBJIHZvaWQgZXdrX3ZpZXdfZHJhd3NfcGFnZV9iYWNrZ3JvdW5kX3NldChFdmFzX09iamVj dCAqbywgRWluYV9Cb29sIGVuYWJsZWQpOwogICovCiBFQVBJIEVpbmFfQm9vbCBld2tfdmlld19w YWdlX2NvbnRlbnRzX2dldChjb25zdCBFdmFzX09iamVjdCAqbywgRXdrX1BhZ2VfQ29udGVudHNf VHlwZSB0eXBlLCBFd2tfUGFnZV9Db250ZW50c19DYiBjYWxsYmFjayk7CiAKKy8qKgorICogU2V0 cyB0aGUgc291cmNlIG1vZGUgYXMgRUlOQV9UUlVFIHRvIGRpc3BsYXkgdGhlIHdlYiBzb3VyY2Ug Y29kZQorICogb3IgRUlOQV9GQUxTRSBvdGhlcndpc2UuIFRoZSBkZWZhdWx0IHZhbHVlIGlzIEVJ TkFfRkFMU0UuCisgKgorICogVGhpcyBtZXRob2Qgc2hvdWxkIGJlIGNhbGxlZCBiZWZvcmUgbG9h ZGluZyBuZXcgY29udGVudHMgb24gd2ViIHZpZXcKKyAqIHNvIHRoYXQgdGhlIG5ldyB2aWV3IG1v ZGUgd2lsbCBiZSBhcHBsaWVkIHRvIHRoZSBuZXcgY29udGVudHMuCisgKgorICogQHBhcmFtIG8g dmlldyBvYmplY3QgdG8gc2V0IHRoZSB2aWV3IHNvdXJjZSBtb2RlCisgKiBAcGFyYW0gZW5hYmxl ZCBhIHN0YXRlIHRvIHNldCB2aWV3IHNvdXJjZSBtb2RlCisgKgorICogQHJldHVybiBAYyBFSU5B X1RSVUUgb24gc3VjY2Vzcywgb3IgQGMgRUlOQV9GQUxTRSBvbiBmYWlsdXJlCisgKi8KK0VBUEkg RWluYV9Cb29sIGV3a192aWV3X3NvdXJjZV9tb2RlX3NldChFdmFzX09iamVjdCAqbywgRWluYV9C b29sIGVuYWJsZWQpOworCisvKioKKyAqIEdldHMgdGhlIHZpZXcgc291cmNlIG1vZGUgb2YgdGhl IGN1cnJlbnQgd2ViIHBhZ2UuCisgKgorICogQHBhcmFtIG8gdmlldyBvYmplY3QgdG8gZ2V0IHRo ZSB2aWV3IHNvdXJjZSBtb2RlCisgKgorICogQHJldHVybiBAYyBFSU5BX1RSVUUgaWYgdGhlIHZp ZXcgbW9kZSBpcyBzZXQgdG8gbG9hZCBzb3VyY2UgY29kZSwgb3IKKyAqICAgICAgICAgQGMgRUlO QV9GQUxTRSBvdGhlcndpc2UKKyAqLworRUFQSSBFaW5hX0Jvb2wgZXdrX3ZpZXdfc291cmNlX21v ZGVfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0ICpvKTsKKwogI2lmZGVmIF9fY3BsdXNwbHVzCiB9CiAj ZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3Rz L3Rlc3RfZXdrMl92aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rl c3RzL3Rlc3RfZXdrMl92aWV3LmNwcAppbmRleCBiMzUwOGQ0YWQ1NWExMDdjYjJlY2QzMjUyMDI2 MWMyZDZiMDhlYTNiLi5iMzc5ZmEwOWE5MTM3M2FhY2VkNTNjZGY0NjA4ZTVlODJiNDJkYzkyIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3 azJfdmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMv dGVzdF9ld2syX3ZpZXcuY3BwCkBAIC05NDUsMyArOTQ1LDIxIEBAIFRFU1RfRihFV0syVW5pdFRl c3RCYXNlLCBld2tfdmlld19wYWdlX2NvbnRlbnRzX2dldCkKICAgICB3aGlsZSAoIWlzT2J0YWlu ZWRQYWdlQ29udGVudHMpCiAgICAgICAgIGVjb3JlX21haW5fbG9vcF9pdGVyYXRlKCk7CiB9CisK K1RFU1RfRihFV0syVW5pdFRlc3RCYXNlLCBld2tfdmlld19zb3VyY2VfbW9kZSkKK3sKKyAgICBj b25zdCBjaGFyIGluZGV4SFRNTFtdID0gIjxodG1sPjxib2R5PlRlc3QgV2ViIFZpZXcgTW9kZTxz Y3JpcHQ+ZG9jdW1lbnQudGl0bGU9d2luZG93LmRvY3VtZW50LmJvZHkuaW5uZXJUZXh0Ozwvc2Ny aXB0PjwvYm9keT48L2h0bWw+IjsKKyAgICBjb25zdCBjaGFyIGNvbnRlbnRzW10gPSAiVGVzdCBX ZWIgVmlldyBNb2RlIjsKKworICAgIC8vIERlZmF1bHQgc291cmNlIG1vZGUgaXMgZmFsc2UuCisg ICAgRVhQRUNUX0ZBTFNFKGV3a192aWV3X3NvdXJjZV9tb2RlX2dldCh3ZWJWaWV3KCkpKTsKKwor ICAgIC8vIExvYWQgd2ViIGNvbnRlbnRzIG9mIHRoZSB3ZWIgcGFnZS4KKyAgICBld2tfdmlld19o dG1sX3N0cmluZ19sb2FkKHdlYlZpZXcoKSwgaW5kZXhIVE1MLCAwLCAwKTsKKyAgICBFWFBFQ1Rf VFJVRSh3YWl0VW50aWxUaXRsZUNoYW5nZWRUbyhjb250ZW50cykpOworCisgICAgLy8gVE9ETzog QWRkIGEgdGVzdCBjYXNlIHdoZW4gdGhlIHNvdXJjZSBtb2RlIGlzIHRydWUuCisgICAgLy8gICAg ICAgQnV0IGl0IG5lZWRzIGEgd2F5IHRvIHJldHJpZXZlIHRoZSBib2R5IGNvbnRlbnRzIHRvIGNv bXBhcmUgdGhlIGxvYWRlZCBjb250ZW50cworICAgIC8vICAgICAgIHN1Y2ggYXMgZXhjdXRpbmcg dGhlIEphdmFTY3JpcHQsICd3aW5kb3cuZG9jdW1lbnQuYm9keS5pbm5lclRleHQnLgorICAgIC8v ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDE5MDQuCit9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IDE2ZTFjN2Ix NTUxMjM2ZDI3NTk4YzIwYTU1YzI1ZTNhM2I4YmVmYjMuLjAxZWMzYjIxNzhjZjlhOTNkM2YwM2Y2 N2RiYTMwMWYwOTk4NTk1MjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuY3BwCkBAIC0yMzcsNiArMjM3LDcgQEAgV2ViUGFnZVByb3h5OjpXZWJQYWdlUHJveHkoUGFn ZUNsaWVudCogcGFnZUNsaWVudCwgUGFzc1JlZlB0cjxXZWJQcm9jZXNzUHJveHk+IHAKICAgICAs IG1fbWluaW11bUxheW91dFdpZHRoKDApCiAgICAgLCBtX21lZGlhVm9sdW1lKDEpCiAgICAgLCBt X21heVN0YXJ0TWVkaWFXaGVuSW5XaW5kb3codHJ1ZSkKKyAgICAsIG1fbWFpbkZyYW1lSW5WaWV3 U291cmNlTW9kZShmYWxzZSkKICNpZiBFTkFCTEUoUEFHRV9WSVNJQklMSVRZX0FQSSkKICAgICAs IG1fdmlzaWJpbGl0eVN0YXRlKFBhZ2VWaXNpYmlsaXR5U3RhdGVWaXNpYmxlKQogI2VuZGlmCkBA IC00MjYzLDkgKzQyNjQsMTUgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmNhbmNlbENvbXBvc2l0aW9u KCkKIH0KICNlbmRpZiAvLyBQTEFURk9STShRVCkgfHwgUExBVEZPUk0oR1RLKQogCi12b2lkIFdl YlBhZ2VQcm94eTo6c2V0TWFpbkZyYW1lSW5WaWV3U291cmNlTW9kZShib29sIGluVmlld1NvdXJj ZU1vZGUpCit2b2lkIFdlYlBhZ2VQcm94eTo6c2V0TWFpbkZyYW1lSW5WaWV3U291cmNlTW9kZShi b29sIG1haW5GcmFtZUluVmlld1NvdXJjZU1vZGUpCiB7Ci0gICAgbV9wcm9jZXNzLT5zZW5kKE1l c3NhZ2VzOjpXZWJQYWdlOjpTZXRNYWluRnJhbWVJblZpZXdTb3VyY2VNb2RlKGluVmlld1NvdXJj ZU1vZGUpLCBtX3BhZ2VJRCk7CisgICAgaWYgKG1fbWFpbkZyYW1lSW5WaWV3U291cmNlTW9kZSA9 PSBtYWluRnJhbWVJblZpZXdTb3VyY2VNb2RlKQorICAgICAgICByZXR1cm47CisKKyAgICBtX21h aW5GcmFtZUluVmlld1NvdXJjZU1vZGUgPSBtYWluRnJhbWVJblZpZXdTb3VyY2VNb2RlOworCisg ICAgaWYgKGlzVmFsaWQoKSkKKyAgICAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQ YWdlOjpTZXRNYWluRnJhbWVJblZpZXdTb3VyY2VNb2RlKG1haW5GcmFtZUluVmlld1NvdXJjZU1v ZGUpLCBtX3BhZ2VJRCk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4IDZlYWYyZmY4ZTY0NTY1NzAyMmNlZWM3OTc5 ZjIyYmRjMzhiZDQ1YTAuLmQyZmUzYjkyZjk5Yjc4NjA5NWFlZWU2ZGJkNWJlZjI5YTYzZTFkNzAg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKQEAgLTc0OCw2ICs3NDgs NyBAQCBwdWJsaWM6CiAgICAgZG91YmxlIG1pbmltdW1MYXlvdXRXaWR0aCgpIGNvbnN0IHsgcmV0 dXJuIG1fbWluaW11bUxheW91dFdpZHRoOyB9CiAgICAgdm9pZCBzZXRNaW5pbXVtTGF5b3V0V2lk dGgoZG91YmxlKTsKIAorICAgIGJvb2wgbWFpbkZyYW1lSW5WaWV3U291cmNlTW9kZSgpIGNvbnN0 IHsgcmV0dXJuIG1fbWFpbkZyYW1lSW5WaWV3U291cmNlTW9kZTsgfQogICAgIHZvaWQgc2V0TWFp bkZyYW1lSW5WaWV3U291cmNlTW9kZShib29sKTsKIAogcHJpdmF0ZToKQEAgLTEyMzIsNiArMTIz Myw4IEBAIHByaXZhdGU6CiAgICAgZmxvYXQgbV9tZWRpYVZvbHVtZTsKICAgICBib29sIG1fbWF5 U3RhcnRNZWRpYVdoZW5JbldpbmRvdzsKIAorICAgIGJvb2wgbV9tYWluRnJhbWVJblZpZXdTb3Vy Y2VNb2RlOworCiAjaWYgUExBVEZPUk0oUVQpCiAgICAgV1RGOjpIYXNoU2V0PFJlZlB0cjxRdFJl ZkNvdW50ZWROZXR3b3JrUmVxdWVzdERhdGE+ID4gbV9hcHBsaWNhdGlvblNjaGVtZVJlcXVlc3Rz OwogI2VuZGlmCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cK aW5kZXggYTIwN2YwYzhlM2U3MTYzMzRkNzUxNGJmMjZkZmU0ODcxNWRmNzg4NC4uMDkzNDU3NWY1 ZmE1ZTFlNmM1MDU3NzlkYzk1YjIxMTQ4MzA1MTEyNCAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdl TG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEzLTAxLTE1ICBK aW53b28gU29uZyAgPGppbndvbzcuc29uZ0BzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXVtX SzJdIEFkZCBBUElzIHRvIHNldC9nZXQgdmlldyBzb3VyY2UgbW9kZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA2NjMzCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgYSBzaG90Y3V0ICdGOCcgaW4g TWluaWJyb3dzZXIgdG8gZGlzcGxheSBhIHNvdXJjZSBjb2RlCisgICAgICAgIG9mIHRoZSB3ZWIg cGFnZSBpbiBhIG5ldyB3aW5kb3cuCisKKyAgICAgICAqIE1pbmlCcm93c2VyL2VmbC9tYWluLmM6 CisgICAgICAgIChvbl9rZXlfZG93bik6CisgICAgICAgIChvbl93aW5kb3dfY3JlYXRlKToKKyAg ICAgICAgKHdpbmRvd19jcmVhdGUpOgorICAgICAgICAoZWxtX21haW4pOgorCiAyMDEzLTAxLTE0 ICBBbGFuIEN1dHRlciAgPGFsYW5jdXR0ZXJAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIEZpeCBF V1MgR0NFIGJ1aWxkIHNjcmlwdHMgdG8gZGV0ZWN0IHdoaWNoIHpvbmUgaXMgYXZhaWxhYmxlCmRp ZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jIGIvVG9vbHMvTWluaUJyb3dz ZXIvZWZsL21haW4uYwppbmRleCAzZmE1Yjc1ZWM1MDQwMDEyNDgyYmY0MmE5NGFmNDJjN2UwYzY0 YjI0Li45ZGJiYzhhODdiNWEyMDY1YzFmNjYwZTYyNjkyZWI2YzY5ZTQwNWQzIDEwMDY0NAotLS0g YS9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL2Vm bC9tYWluLmMKQEAgLTE0MSw3ICsxNDEsNyBAQCBzdGF0aWMgY29uc3QgRWNvcmVfR2V0b3B0IG9w dGlvbnMgPSB7CiAgICAgfQogfTsKIAotc3RhdGljIEJyb3dzZXJfV2luZG93ICp3aW5kb3dfY3Jl YXRlKEV2YXNfT2JqZWN0KiBvcGVuZXIsIGNvbnN0IGNoYXIgKnVybCwgaW50IHdpZHRoLCBpbnQg aGVpZ2h0KTsKK3N0YXRpYyBCcm93c2VyX1dpbmRvdyAqd2luZG93X2NyZWF0ZShFdmFzX09iamVj dCogb3BlbmVyLCBjb25zdCBjaGFyICp1cmwsIGludCB3aWR0aCwgaW50IGhlaWdodCwgRWluYV9C b29sIHZpZXdfbW9kZSk7CiAKIHN0YXRpYyBCcm93c2VyX1dpbmRvdyAqd2luZG93X2ZpbmRfd2l0 aF9lbG1fd2luZG93KEV2YXNfT2JqZWN0ICplbG1fd2luZG93KQogewpAQCAtMjkwLDE2ICsyOTAs MjAgQEAgb25fa2V5X2Rvd24odm9pZCAqdXNlcl9kYXRhLCBFdmFzICplLCBFdmFzX09iamVjdCAq ZXdrX3ZpZXcsIHZvaWQgKmV2ZW50X2luZm8pCiAgICAgfSBlbHNlIGlmICghc3RyY21wKGV2LT5r ZXksICJGNiIpKSB7CiAgICAgICAgIGluZm8oIlN0b3AgKEY2KSB3YXMgcHJlc3NlZCwgc3RvcCBs b2FkaW5nLlxuIik7CiAgICAgICAgIGV3a192aWV3X3N0b3AoZXdrX3ZpZXcpOwotICAgIH0gZWxz ZSBpZiAgKCFzdHJjbXAoZXYtPmtleSwgIkY3IikpIHsKKyAgICB9IGVsc2UgaWYgKCFzdHJjbXAo ZXYtPmtleSwgIkY3IikpIHsKICAgICAgICAgRXdrX1BhZ2luYXRpb25fTW9kZSBtb2RlID0gIGV3 a192aWV3X3BhZ2luYXRpb25fbW9kZV9nZXQoZXdrX3ZpZXcpOwogICAgICAgICBtb2RlID0gKCsr bW9kZSkgJSAoRVdLX1BBR0lOQVRJT05fTU9ERV9CT1RUT01fVE9fVE9QICsgMSk7CiAgICAgICAg IGlmIChld2tfdmlld19wYWdpbmF0aW9uX21vZGVfc2V0KGV3a192aWV3LCBtb2RlKSkKICAgICAg ICAgICAgIGluZm8oIkNoYW5nZSBQYWdpbmF0aW9uIE1vZGUgKEY3KSB3YXMgcHJlc3NlZCwgY2hh bmdlZCB0bzogJWRcbiIsIG1vZGUpOwogICAgICAgICBlbHNlCiAgICAgICAgICAgICBpbmZvKCJD aGFuZ2UgUGFnaW5hdGlvbiBNb2RlIChGNykgd2FzIHByZXNzZWQsIGJ1dCBOT1QgY2hhbmdlZCEi KTsKKyAgICB9IGVsc2UgaWYgKCFzdHJjbXAoZXYtPmtleSwgIkY4IikpIHsKKyAgICAgICAgaW5m bygiQ3JlYXRlIHNvdWNlIGNvZGUgd2luZG93IChGOCkgd2FzIHByZXNzZWQuXG4iKTsKKyAgICAg ICAgQnJvd3Nlcl9XaW5kb3cgKndpbmRvdyA9IHdpbmRvd19jcmVhdGUoZXdrX3ZpZXcsIGV3a192 aWV3X3VybF9nZXQoZXdrX3ZpZXcpLCAwLCAwLCBFSU5BX1RSVUUpOworICAgICAgICB3aW5kb3dz ID0gZWluYV9saXN0X2FwcGVuZCh3aW5kb3dzLCB3aW5kb3cpOwogICAgIH0gZWxzZSBpZiAoIXN0 cmNtcChldi0+a2V5LCAibiIpICYmIGN0cmxQcmVzc2VkKSB7CiAgICAgICAgIGluZm8oIkNyZWF0 ZSBuZXcgd2luZG93IChDdHJsK24pIHdhcyBwcmVzc2VkLlxuIik7Ci0gICAgICAgIEJyb3dzZXJf V2luZG93ICp3aW5kb3cgPSB3aW5kb3dfY3JlYXRlKDAsIERFRkFVTFRfVVJMLCAwLCAwKTsKKyAg ICAgICAgQnJvd3Nlcl9XaW5kb3cgKndpbmRvdyA9IHdpbmRvd19jcmVhdGUoMCwgREVGQVVMVF9V UkwsIDAsIDAsIEVJTkFfRkFMU0UpOwogICAgICAgICAvLyAwIGVxdWFscyBkZWZhdWx0IHdpZHRo IGFuZCBoZWlnaHQuCiAgICAgICAgIHdpbmRvd3MgPSBlaW5hX2xpc3RfYXBwZW5kKHdpbmRvd3Ms IHdpbmRvdyk7CiAgICAgfSBlbHNlIGlmICghc3RyY21wKGV2LT5rZXksICJpIikgJiYgY3RybFBy ZXNzZWQpIHsKQEAgLTg3OSw3ICs4ODMsNyBAQCBvbl93aW5kb3dfY3JlYXRlKEV3a19WaWV3X1Nt YXJ0X0RhdGEgKnNtYXJ0RGF0YSwgY29uc3QgY2hhciAqdXJsLCBjb25zdCBFd2tfV2luZAogICAg IGlmICghaGVpZ2h0KQogICAgICAgICBoZWlnaHQgPSB3aW5kb3dfaGVpZ2h0OwogCi0gICAgQnJv d3Nlcl9XaW5kb3cgKndpbmRvdyA9IHdpbmRvd19jcmVhdGUoc21hcnREYXRhLT5zZWxmLCB1cmws IHdpZHRoLCBoZWlnaHQpOworICAgIEJyb3dzZXJfV2luZG93ICp3aW5kb3cgPSB3aW5kb3dfY3Jl YXRlKHNtYXJ0RGF0YS0+c2VsZiwgdXJsLCB3aWR0aCwgaGVpZ2h0LCBFSU5BX0ZBTFNFKTsKICAg ICBFdmFzX09iamVjdCAqbmV3X3ZpZXcgPSB3aW5kb3ctPmV3a192aWV3OwogCiAgICAgd2luZG93 cyA9IGVpbmFfbGlzdF9hcHBlbmQod2luZG93cywgd2luZG93KTsKQEAgLTEwNzQsNyArMTA3OCw3 IEBAIGNyZWF0ZV90b29sYmFyX2J1dHRvbihFdmFzX09iamVjdCAqZWxtX3dpbmRvdywgY29uc3Qg Y2hhciAqaWNvbl9uYW1lKQogICAgIHJldHVybiBidXR0b247CiB9CiAKLXN0YXRpYyBCcm93c2Vy X1dpbmRvdyAqd2luZG93X2NyZWF0ZShFdmFzX09iamVjdCAqb3BlbmVyLCBjb25zdCBjaGFyICp1 cmwsIGludCB3aWR0aCwgaW50IGhlaWdodCkKK3N0YXRpYyBCcm93c2VyX1dpbmRvdyAqd2luZG93 X2NyZWF0ZShFdmFzX09iamVjdCAqb3BlbmVyLCBjb25zdCBjaGFyICp1cmwsIGludCB3aWR0aCwg aW50IGhlaWdodCwgRWluYV9Cb29sIHZpZXdfbW9kZSkKIHsKICAgICBCcm93c2VyX1dpbmRvdyAq d2luZG93ID0gbWFsbG9jKHNpemVvZihCcm93c2VyX1dpbmRvdykpOwogICAgIGlmICghd2luZG93 KSB7CkBAIC0xMTg3LDYgKzExOTEsNyBAQCBzdGF0aWMgQnJvd3Nlcl9XaW5kb3cgKndpbmRvd19j cmVhdGUoRXZhc19PYmplY3QgKm9wZW5lciwgY29uc3QgY2hhciAqdXJsLCBpbnQgdwogICAgIGV3 a192aWV3X3RoZW1lX3NldCh3aW5kb3ctPmV3a192aWV3LCBUSEVNRV9ESVIgIi9kZWZhdWx0LmVk aiIpOwogICAgIGlmIChkZXZpY2VfcGl4ZWxfcmF0aW8pCiAgICAgICAgIGV3a192aWV3X2Rldmlj ZV9waXhlbF9yYXRpb19zZXQod2luZG93LT5ld2tfdmlldywgKGZsb2F0KWRldmljZV9waXhlbF9y YXRpbyk7CisgICAgZXdrX3ZpZXdfc291cmNlX21vZGVfc2V0KHdpbmRvdy0+ZXdrX3ZpZXcsIHZp ZXdfbW9kZSk7CiAKICAgICAvKiBTZXQgdGhlIHpvb20gbGV2ZWwgdG8gZGVmYXVsdCAqLwogICAg IHdpbmRvdy0+Y3VycmVudF96b29tX2xldmVsID0gREVGQVVMVF9aT09NX0xFVkVMOwpAQCAtMTMx NywxMCArMTMyMiwxMCBAQCBlbG1fbWFpbihpbnQgYXJnYywgY2hhciAqYXJndltdKQogCiAgICAg aWYgKGFyZ3MgPCBhcmdjKSB7CiAgICAgICAgIGNoYXIgKnVybCA9IHVybF9mcm9tX3VzZXJfaW5w dXQoYXJndlthcmdzXSk7Ci0gICAgICAgIHdpbmRvdyA9IHdpbmRvd19jcmVhdGUoMCwgdXJsLCAw LCAwKTsKKyAgICAgICAgd2luZG93ID0gd2luZG93X2NyZWF0ZSgwLCB1cmwsIDAsIDAsIEVJTkFf RkFMU0UpOwogICAgICAgICBmcmVlKHVybCk7CiAgICAgfSBlbHNlCi0gICAgICAgIHdpbmRvdyA9 IHdpbmRvd19jcmVhdGUoMCwgREVGQVVMVF9VUkwsIDAsIDApOworICAgICAgICB3aW5kb3cgPSB3 aW5kb3dfY3JlYXRlKDAsIERFRkFVTFRfVVJMLCAwLCAwLCBFSU5BX0ZBTFNFKTsKIAogICAgIGlm ICghd2luZG93KQogICAgICAgICByZXR1cm4gcXVpdChFSU5BX0ZBTFNFLCAiRVJST1I6IGNvdWxk IG5vdCBjcmVhdGUgYnJvd3NlciB3aW5kb3cuXG4iKTsK 182929 2013-01-16 00:23:44 -0800 2013-01-16 17:11:04 -0800 Patch bug-106633-20130116172044.patch text/plain 11551 jinwoo7.song U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5NzA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYWMxMTZmNGU2YzA2MjQw ZWZmOWI2ZTc1M2E1MTYzMTg4OTdiZWZhMy4uMDE0OTUzMTFmZGEzYTM3OTk3MTcxN2M4MTNkOGY1 MzY0NDM3YTM0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEzLTAxLTE1ICBKaW53 b28gU29uZyAgPGppbndvbzcuc29uZ0BzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJd IEFkZCBBUElzIHRvIHNldC9nZXQgdmlldyBzb3VyY2UgbW9kZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA2NjMzCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgQVBJcyB0byBzZXQvZ2V0IHZpZXcg c291cmNlIG1vZGUgZm9yIGVuYWJsaW5nIHRvIGxvYWQKKyAgICAgICAgdGhlIHNvdXJjZSBjb2Rl IG9mIHRoZSB3ZWIgcGFnZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3 LmNwcDoKKyAgICAgICAgKGV3a192aWV3X3NvdXJjZV9tb2RlX3NldCk6CisgICAgICAgIChld2tf dmlld19zb3VyY2VfbW9kZV9nZXQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a192 aWV3Lmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX3ZpZXcu Y3BwOgorICAgICAgICAoVEVTVF9GKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpXZWJQYWdlUHJveHkpOgorICAg ICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnNldE1haW5GcmFtZUluVmlld1NvdXJjZU1vZGUp OgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKFdlYktpdDo6 V2ViUGFnZVByb3h5OjptYWluRnJhbWVJblZpZXdTb3VyY2VNb2RlKToKKyAgICAgICAgKFdlYlBh Z2VQcm94eSk6CisKIDIwMTMtMDEtMTQgIERlYW4gSmFja3NvbiAgPGRpbm9AYXBwbGUuY29tPgog CiAgICAgICAgIFtBTkdMRV0gVXBkYXRlIEFOR0xFIGluIFdlYktpdApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwCmluZGV4IGVmNTIxM2VmMWE0YWQ2ZTFj ZWZmODdiNzZmNzQyNzI3NTFkNzgzMDQuLjU4NWI1YTIzM2UzNTQ1MzVlNTAzZTllODllOGNjNDM1 OTczOWUzNjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3 a192aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmll dy5jcHAKQEAgLTk4MywzICs5ODMsMTkgQEAgRWluYV9Cb29sIGV3a192aWV3X3BhZ2VfY29udGVu dHNfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0KiBld2tWaWV3LCBFd2tfUGFnZV9Db250ZW4KIAogICAg IHJldHVybiB0cnVlOwogfQorCitFaW5hX0Jvb2wgZXdrX3ZpZXdfc291cmNlX21vZGVfc2V0KEV2 YXNfT2JqZWN0KiBld2tWaWV3LCBFaW5hX0Jvb2wgZW5hYmxlZCkKK3sKKyAgICBFV0tfVklFV19J TVBMX0dFVF9PUl9SRVRVUk4oZXdrVmlldywgaW1wbCwgZmFsc2UpOworCisgICAgaW1wbC0+cGFn ZSgpLT5zZXRNYWluRnJhbWVJblZpZXdTb3VyY2VNb2RlKGVuYWJsZWQpOworCisgICAgcmV0dXJu IHRydWU7Cit9CisKK0VpbmFfQm9vbCBld2tfdmlld19zb3VyY2VfbW9kZV9nZXQoY29uc3QgRXZh c19PYmplY3QqIGV3a1ZpZXcpCit7CisgICAgRVdLX1ZJRVdfSU1QTF9HRVRfT1JfUkVUVVJOKGV3 a1ZpZXcsIGltcGwsIGZhbHNlKTsKKworICAgIHJldHVybiBpbXBsLT5wYWdlKCktPm1haW5GcmFt ZUluVmlld1NvdXJjZU1vZGUoKTsKK30KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL2V3a192aWV3LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2Vm bC9ld2tfdmlldy5oCmluZGV4IGIyZmY2NWE5NWRkOWY1MmU0OTlkYmJmMGRlNmFlMmM3ZTlmZWUw M2UuLjJhZWI3YTczNzY5YjYyM2MwYjU3OWFmYTJmNDE2NmUzMGI4NzUzYzQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmgKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaApAQCAtODcwLDYgKzg3MCwzMCBA QCBFQVBJIHZvaWQgZXdrX3ZpZXdfZHJhd3NfcGFnZV9iYWNrZ3JvdW5kX3NldChFdmFzX09iamVj dCAqbywgRWluYV9Cb29sIGVuYWJsZWQpOwogICovCiBFQVBJIEVpbmFfQm9vbCBld2tfdmlld19w YWdlX2NvbnRlbnRzX2dldChjb25zdCBFdmFzX09iamVjdCAqbywgRXdrX1BhZ2VfQ29udGVudHNf VHlwZSB0eXBlLCBFd2tfUGFnZV9Db250ZW50c19DYiBjYWxsYmFjayk7CiAKKy8qKgorICogU2V0 cyB0aGUgc291cmNlIG1vZGUgYXMgRUlOQV9UUlVFIHRvIGRpc3BsYXkgdGhlIHdlYiBzb3VyY2Ug Y29kZQorICogb3IgRUlOQV9GQUxTRSBvdGhlcndpc2UuIFRoZSBkZWZhdWx0IHZhbHVlIGlzIEVJ TkFfRkFMU0UuCisgKgorICogVGhpcyBtZXRob2Qgc2hvdWxkIGJlIGNhbGxlZCBiZWZvcmUgbG9h ZGluZyBuZXcgY29udGVudHMgb24gd2ViIHZpZXcKKyAqIHNvIHRoYXQgdGhlIG5ldyB2aWV3IG1v ZGUgd2lsbCBiZSBhcHBsaWVkIHRvIHRoZSBuZXcgY29udGVudHMuCisgKgorICogQHBhcmFtIG8g dmlldyBvYmplY3QgdG8gc2V0IHRoZSB2aWV3IHNvdXJjZSBtb2RlCisgKiBAcGFyYW0gZW5hYmxl ZCBhIHN0YXRlIHRvIHNldCB2aWV3IHNvdXJjZSBtb2RlCisgKgorICogQHJldHVybiBAYyBFSU5B X1RSVUUgb24gc3VjY2Vzcywgb3IgQGMgRUlOQV9GQUxTRSBvbiBmYWlsdXJlCisgKi8KK0VBUEkg RWluYV9Cb29sIGV3a192aWV3X3NvdXJjZV9tb2RlX3NldChFdmFzX09iamVjdCAqbywgRWluYV9C b29sIGVuYWJsZWQpOworCisvKioKKyAqIEdldHMgdGhlIHZpZXcgc291cmNlIG1vZGUgb2YgdGhl IGN1cnJlbnQgd2ViIHBhZ2UuCisgKgorICogQHBhcmFtIG8gdmlldyBvYmplY3QgdG8gZ2V0IHRo ZSB2aWV3IHNvdXJjZSBtb2RlCisgKgorICogQHJldHVybiBAYyBFSU5BX1RSVUUgaWYgdGhlIHZp ZXcgbW9kZSBpcyBzZXQgdG8gbG9hZCBzb3VyY2UgY29kZSwgb3IKKyAqICAgICAgICAgQGMgRUlO QV9GQUxTRSBvdGhlcndpc2UKKyAqLworRUFQSSBFaW5hX0Jvb2wgZXdrX3ZpZXdfc291cmNlX21v ZGVfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0ICpvKTsKKwogI2lmZGVmIF9fY3BsdXNwbHVzCiB9CiAj ZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3Rz L3Rlc3RfZXdrMl92aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rl c3RzL3Rlc3RfZXdrMl92aWV3LmNwcAppbmRleCBiMzUwOGQ0YWQ1NWExMDdjYjJlY2QzMjUyMDI2 MWMyZDZiMDhlYTNiLi5hYzg5ODIxZTc4NGQ3OTViZDNmZGQzYWY0NGY0N2QyMzM2ZjUyMzAwIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3 azJfdmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMv dGVzdF9ld2syX3ZpZXcuY3BwCkBAIC05NDUsMyArOTQ1LDI0IEBAIFRFU1RfRihFV0syVW5pdFRl c3RCYXNlLCBld2tfdmlld19wYWdlX2NvbnRlbnRzX2dldCkKICAgICB3aGlsZSAoIWlzT2J0YWlu ZWRQYWdlQ29udGVudHMpCiAgICAgICAgIGVjb3JlX21haW5fbG9vcF9pdGVyYXRlKCk7CiB9CisK K1RFU1RfRihFV0syVW5pdFRlc3RCYXNlLCBld2tfdmlld19zb3VyY2VfbW9kZSkKK3sKKyAgICBj b25zdCBjaGFyIGluZGV4SFRNTFtdID0gIjxodG1sPjxib2R5PlRlc3QgV2ViIFZpZXcgTW9kZTxz Y3JpcHQ+ZG9jdW1lbnQudGl0bGU9d2luZG93LmRvY3VtZW50LmJvZHkuaW5uZXJUZXh0Ozwvc2Ny aXB0PjwvYm9keT48L2h0bWw+IjsKKyAgICBjb25zdCBjaGFyIGNvbnRlbnRzW10gPSAiVGVzdCBX ZWIgVmlldyBNb2RlIjsKKworICAgIC8vIERlZmF1bHQgc291cmNlIG1vZGUgaXMgZmFsc2UuCisg ICAgRVhQRUNUX0ZBTFNFKGV3a192aWV3X3NvdXJjZV9tb2RlX2dldCh3ZWJWaWV3KCkpKTsKKwor ICAgIC8vIExvYWQgd2ViIGNvbnRlbnRzIG9mIHRoZSB3ZWIgcGFnZS4KKyAgICBld2tfdmlld19o dG1sX3N0cmluZ19sb2FkKHdlYlZpZXcoKSwgaW5kZXhIVE1MLCAwLCAwKTsKKyAgICBFWFBFQ1Rf VFJVRSh3YWl0VW50aWxUaXRsZUNoYW5nZWRUbyhjb250ZW50cykpOworCisgICAgRVhQRUNUX1RS VUUoZXdrX3ZpZXdfc291cmNlX21vZGVfc2V0KHdlYlZpZXcoKSwgdHJ1ZSkpOworICAgIEVYUEVD VF9UUlVFKGV3a192aWV3X3NvdXJjZV9tb2RlX2dldCh3ZWJWaWV3KCkpKTsKKworICAgIC8vIFRP RE86IEFkZCBhIHRlc3QgY2FzZSB3aGVuIHRoZSBzb3VyY2UgbW9kZSBpcyB0cnVlLgorICAgIC8v ICAgICAgIEJ1dCBpdCBuZWVkcyBhIHdheSB0byByZXRyaWV2ZSB0aGUgYm9keSBjb250ZW50cyB0 byBjb21wYXJlIHRoZSBsb2FkZWQgY29udGVudHMKKyAgICAvLyAgICAgICBzdWNoIGFzIGV4Y3V0 aW5nIHRoZSBKYXZhU2NyaXB0LCAnd2luZG93LmRvY3VtZW50LmJvZHkuaW5uZXJUZXh0Jy4KKyAg ICAvLyAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxOTA0 LgorfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5j cHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAppbmRleCAxNmUx YzdiMTU1MTIzNmQyNzU5OGMyMGE1NWMyNWUzYTNiOGJlZmIzLi4wMWVjM2IyMTc4Y2Y5YTkzZDNm MDNmNjdkYmEzMDFmMDk5ODU5NTIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmNwcApAQCAtMjM3LDYgKzIzNyw3IEBAIFdlYlBhZ2VQcm94eTo6V2ViUGFnZVByb3h5 KFBhZ2VDbGllbnQqIHBhZ2VDbGllbnQsIFBhc3NSZWZQdHI8V2ViUHJvY2Vzc1Byb3h5PiBwCiAg ICAgLCBtX21pbmltdW1MYXlvdXRXaWR0aCgwKQogICAgICwgbV9tZWRpYVZvbHVtZSgxKQogICAg ICwgbV9tYXlTdGFydE1lZGlhV2hlbkluV2luZG93KHRydWUpCisgICAgLCBtX21haW5GcmFtZUlu Vmlld1NvdXJjZU1vZGUoZmFsc2UpCiAjaWYgRU5BQkxFKFBBR0VfVklTSUJJTElUWV9BUEkpCiAg ICAgLCBtX3Zpc2liaWxpdHlTdGF0ZShQYWdlVmlzaWJpbGl0eVN0YXRlVmlzaWJsZSkKICNlbmRp ZgpAQCAtNDI2Myw5ICs0MjY0LDE1IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpjYW5jZWxDb21wb3Np dGlvbigpCiB9CiAjZW5kaWYgLy8gUExBVEZPUk0oUVQpIHx8IFBMQVRGT1JNKEdUSykKIAotdm9p ZCBXZWJQYWdlUHJveHk6OnNldE1haW5GcmFtZUluVmlld1NvdXJjZU1vZGUoYm9vbCBpblZpZXdT b3VyY2VNb2RlKQordm9pZCBXZWJQYWdlUHJveHk6OnNldE1haW5GcmFtZUluVmlld1NvdXJjZU1v ZGUoYm9vbCBtYWluRnJhbWVJblZpZXdTb3VyY2VNb2RlKQogewotICAgIG1fcHJvY2Vzcy0+c2Vu ZChNZXNzYWdlczo6V2ViUGFnZTo6U2V0TWFpbkZyYW1lSW5WaWV3U291cmNlTW9kZShpblZpZXdT b3VyY2VNb2RlKSwgbV9wYWdlSUQpOworICAgIGlmIChtX21haW5GcmFtZUluVmlld1NvdXJjZU1v ZGUgPT0gbWFpbkZyYW1lSW5WaWV3U291cmNlTW9kZSkKKyAgICAgICAgcmV0dXJuOworCisgICAg bV9tYWluRnJhbWVJblZpZXdTb3VyY2VNb2RlID0gbWFpbkZyYW1lSW5WaWV3U291cmNlTW9kZTsK KworICAgIGlmIChpc1ZhbGlkKCkpCisgICAgICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6 V2ViUGFnZTo6U2V0TWFpbkZyYW1lSW5WaWV3U291cmNlTW9kZShtYWluRnJhbWVJblZpZXdTb3Vy Y2VNb2RlKSwgbV9wYWdlSUQpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCA2ZWFmMmZmOGU2NDU2NTcwMjJjZWVj Nzk3OWYyMmJkYzM4YmQ0NWEwLi5kMmZlM2I5MmY5OWI3ODYwOTVhZWVlNmRiZDViZWYyOWE2M2Ux ZDcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBAIC03NDgsNiAr NzQ4LDcgQEAgcHVibGljOgogICAgIGRvdWJsZSBtaW5pbXVtTGF5b3V0V2lkdGgoKSBjb25zdCB7 IHJldHVybiBtX21pbmltdW1MYXlvdXRXaWR0aDsgfQogICAgIHZvaWQgc2V0TWluaW11bUxheW91 dFdpZHRoKGRvdWJsZSk7CiAKKyAgICBib29sIG1haW5GcmFtZUluVmlld1NvdXJjZU1vZGUoKSBj b25zdCB7IHJldHVybiBtX21haW5GcmFtZUluVmlld1NvdXJjZU1vZGU7IH0KICAgICB2b2lkIHNl dE1haW5GcmFtZUluVmlld1NvdXJjZU1vZGUoYm9vbCk7CiAKIHByaXZhdGU6CkBAIC0xMjMyLDYg KzEyMzMsOCBAQCBwcml2YXRlOgogICAgIGZsb2F0IG1fbWVkaWFWb2x1bWU7CiAgICAgYm9vbCBt X21heVN0YXJ0TWVkaWFXaGVuSW5XaW5kb3c7CiAKKyAgICBib29sIG1fbWFpbkZyYW1lSW5WaWV3 U291cmNlTW9kZTsKKwogI2lmIFBMQVRGT1JNKFFUKQogICAgIFdURjo6SGFzaFNldDxSZWZQdHI8 UXRSZWZDb3VudGVkTmV0d29ya1JlcXVlc3REYXRhPiA+IG1fYXBwbGljYXRpb25TY2hlbWVSZXF1 ZXN0czsKICNlbmRpZgpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdl TG9nCmluZGV4IGEyMDdmMGM4ZTNlNzE2MzM0ZDc1MTRiZjI2ZGZlNDg3MTVkZjc4ODQuLjA5MzQ1 NzVmNWZhNWUxZTZjNTA1Nzc5ZGM5NWIyMTE0ODMwNTExMjQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0No YW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMy0wMS0x NSAgSmlud29vIFNvbmcgIDxqaW53b283LnNvbmdAc2Ftc3VuZy5jb20+CisKKyAgICAgICAgW0VG TF1bV0syXSBBZGQgQVBJcyB0byBzZXQvZ2V0IHZpZXcgc291cmNlIG1vZGUKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNjYzMworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGVkIGEgc2hvdGN1dCAnRjgn IGluIE1pbmlicm93c2VyIHRvIGRpc3BsYXkgYSBzb3VyY2UgY29kZQorICAgICAgICBvZiB0aGUg d2ViIHBhZ2UgaW4gYSBuZXcgd2luZG93LgorCisgICAgICAgKiBNaW5pQnJvd3Nlci9lZmwvbWFp bi5jOgorICAgICAgICAob25fa2V5X2Rvd24pOgorICAgICAgICAob25fd2luZG93X2NyZWF0ZSk6 CisgICAgICAgICh3aW5kb3dfY3JlYXRlKToKKyAgICAgICAgKGVsbV9tYWluKToKKwogMjAxMy0w MS0xNCAgQWxhbiBDdXR0ZXIgIDxhbGFuY3V0dGVyQGNocm9taXVtLm9yZz4KIAogICAgICAgICBG aXggRVdTIEdDRSBidWlsZCBzY3JpcHRzIHRvIGRldGVjdCB3aGljaCB6b25lIGlzIGF2YWlsYWJs ZQpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYyBiL1Rvb2xzL01pbmlC cm93c2VyL2VmbC9tYWluLmMKaW5kZXggM2ZhNWI3NWVjNTA0MDAxMjQ4MmJmNDJhOTRhZjQyYzdl MGM2NGIyNC4uOWRiYmM4YTg3YjVhMjA2NWMxZjY2MGU2MjY5MmViNmM2OWU0MDVkMyAxMDA2NDQK LS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYworKysgYi9Ub29scy9NaW5pQnJvd3Nl ci9lZmwvbWFpbi5jCkBAIC0xNDEsNyArMTQxLDcgQEAgc3RhdGljIGNvbnN0IEVjb3JlX0dldG9w dCBvcHRpb25zID0gewogICAgIH0KIH07CiAKLXN0YXRpYyBCcm93c2VyX1dpbmRvdyAqd2luZG93 X2NyZWF0ZShFdmFzX09iamVjdCogb3BlbmVyLCBjb25zdCBjaGFyICp1cmwsIGludCB3aWR0aCwg aW50IGhlaWdodCk7CitzdGF0aWMgQnJvd3Nlcl9XaW5kb3cgKndpbmRvd19jcmVhdGUoRXZhc19P YmplY3QqIG9wZW5lciwgY29uc3QgY2hhciAqdXJsLCBpbnQgd2lkdGgsIGludCBoZWlnaHQsIEVp bmFfQm9vbCB2aWV3X21vZGUpOwogCiBzdGF0aWMgQnJvd3Nlcl9XaW5kb3cgKndpbmRvd19maW5k X3dpdGhfZWxtX3dpbmRvdyhFdmFzX09iamVjdCAqZWxtX3dpbmRvdykKIHsKQEAgLTI5MCwxNiAr MjkwLDIwIEBAIG9uX2tleV9kb3duKHZvaWQgKnVzZXJfZGF0YSwgRXZhcyAqZSwgRXZhc19PYmpl Y3QgKmV3a192aWV3LCB2b2lkICpldmVudF9pbmZvKQogICAgIH0gZWxzZSBpZiAoIXN0cmNtcChl di0+a2V5LCAiRjYiKSkgewogICAgICAgICBpbmZvKCJTdG9wIChGNikgd2FzIHByZXNzZWQsIHN0 b3AgbG9hZGluZy5cbiIpOwogICAgICAgICBld2tfdmlld19zdG9wKGV3a192aWV3KTsKLSAgICB9 IGVsc2UgaWYgICghc3RyY21wKGV2LT5rZXksICJGNyIpKSB7CisgICAgfSBlbHNlIGlmICghc3Ry Y21wKGV2LT5rZXksICJGNyIpKSB7CiAgICAgICAgIEV3a19QYWdpbmF0aW9uX01vZGUgbW9kZSA9 ICBld2tfdmlld19wYWdpbmF0aW9uX21vZGVfZ2V0KGV3a192aWV3KTsKICAgICAgICAgbW9kZSA9 ICgrK21vZGUpICUgKEVXS19QQUdJTkFUSU9OX01PREVfQk9UVE9NX1RPX1RPUCArIDEpOwogICAg ICAgICBpZiAoZXdrX3ZpZXdfcGFnaW5hdGlvbl9tb2RlX3NldChld2tfdmlldywgbW9kZSkpCiAg ICAgICAgICAgICBpbmZvKCJDaGFuZ2UgUGFnaW5hdGlvbiBNb2RlIChGNykgd2FzIHByZXNzZWQs IGNoYW5nZWQgdG86ICVkXG4iLCBtb2RlKTsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgaW5m bygiQ2hhbmdlIFBhZ2luYXRpb24gTW9kZSAoRjcpIHdhcyBwcmVzc2VkLCBidXQgTk9UIGNoYW5n ZWQhIik7CisgICAgfSBlbHNlIGlmICghc3RyY21wKGV2LT5rZXksICJGOCIpKSB7CisgICAgICAg IGluZm8oIkNyZWF0ZSBzb3VjZSBjb2RlIHdpbmRvdyAoRjgpIHdhcyBwcmVzc2VkLlxuIik7Cisg ICAgICAgIEJyb3dzZXJfV2luZG93ICp3aW5kb3cgPSB3aW5kb3dfY3JlYXRlKGV3a192aWV3LCBl d2tfdmlld191cmxfZ2V0KGV3a192aWV3KSwgMCwgMCwgRUlOQV9UUlVFKTsKKyAgICAgICAgd2lu ZG93cyA9IGVpbmFfbGlzdF9hcHBlbmQod2luZG93cywgd2luZG93KTsKICAgICB9IGVsc2UgaWYg KCFzdHJjbXAoZXYtPmtleSwgIm4iKSAmJiBjdHJsUHJlc3NlZCkgewogICAgICAgICBpbmZvKCJD cmVhdGUgbmV3IHdpbmRvdyAoQ3RybCtuKSB3YXMgcHJlc3NlZC5cbiIpOwotICAgICAgICBCcm93 c2VyX1dpbmRvdyAqd2luZG93ID0gd2luZG93X2NyZWF0ZSgwLCBERUZBVUxUX1VSTCwgMCwgMCk7 CisgICAgICAgIEJyb3dzZXJfV2luZG93ICp3aW5kb3cgPSB3aW5kb3dfY3JlYXRlKDAsIERFRkFV TFRfVVJMLCAwLCAwLCBFSU5BX0ZBTFNFKTsKICAgICAgICAgLy8gMCBlcXVhbHMgZGVmYXVsdCB3 aWR0aCBhbmQgaGVpZ2h0LgogICAgICAgICB3aW5kb3dzID0gZWluYV9saXN0X2FwcGVuZCh3aW5k b3dzLCB3aW5kb3cpOwogICAgIH0gZWxzZSBpZiAoIXN0cmNtcChldi0+a2V5LCAiaSIpICYmIGN0 cmxQcmVzc2VkKSB7CkBAIC04NzksNyArODgzLDcgQEAgb25fd2luZG93X2NyZWF0ZShFd2tfVmll d19TbWFydF9EYXRhICpzbWFydERhdGEsIGNvbnN0IGNoYXIgKnVybCwgY29uc3QgRXdrX1dpbmQK ICAgICBpZiAoIWhlaWdodCkKICAgICAgICAgaGVpZ2h0ID0gd2luZG93X2hlaWdodDsKIAotICAg IEJyb3dzZXJfV2luZG93ICp3aW5kb3cgPSB3aW5kb3dfY3JlYXRlKHNtYXJ0RGF0YS0+c2VsZiwg dXJsLCB3aWR0aCwgaGVpZ2h0KTsKKyAgICBCcm93c2VyX1dpbmRvdyAqd2luZG93ID0gd2luZG93 X2NyZWF0ZShzbWFydERhdGEtPnNlbGYsIHVybCwgd2lkdGgsIGhlaWdodCwgRUlOQV9GQUxTRSk7 CiAgICAgRXZhc19PYmplY3QgKm5ld192aWV3ID0gd2luZG93LT5ld2tfdmlldzsKIAogICAgIHdp bmRvd3MgPSBlaW5hX2xpc3RfYXBwZW5kKHdpbmRvd3MsIHdpbmRvdyk7CkBAIC0xMDc0LDcgKzEw NzgsNyBAQCBjcmVhdGVfdG9vbGJhcl9idXR0b24oRXZhc19PYmplY3QgKmVsbV93aW5kb3csIGNv bnN0IGNoYXIgKmljb25fbmFtZSkKICAgICByZXR1cm4gYnV0dG9uOwogfQogCi1zdGF0aWMgQnJv d3Nlcl9XaW5kb3cgKndpbmRvd19jcmVhdGUoRXZhc19PYmplY3QgKm9wZW5lciwgY29uc3QgY2hh ciAqdXJsLCBpbnQgd2lkdGgsIGludCBoZWlnaHQpCitzdGF0aWMgQnJvd3Nlcl9XaW5kb3cgKndp bmRvd19jcmVhdGUoRXZhc19PYmplY3QgKm9wZW5lciwgY29uc3QgY2hhciAqdXJsLCBpbnQgd2lk dGgsIGludCBoZWlnaHQsIEVpbmFfQm9vbCB2aWV3X21vZGUpCiB7CiAgICAgQnJvd3Nlcl9XaW5k b3cgKndpbmRvdyA9IG1hbGxvYyhzaXplb2YoQnJvd3Nlcl9XaW5kb3cpKTsKICAgICBpZiAoIXdp bmRvdykgewpAQCAtMTE4Nyw2ICsxMTkxLDcgQEAgc3RhdGljIEJyb3dzZXJfV2luZG93ICp3aW5k b3dfY3JlYXRlKEV2YXNfT2JqZWN0ICpvcGVuZXIsIGNvbnN0IGNoYXIgKnVybCwgaW50IHcKICAg ICBld2tfdmlld190aGVtZV9zZXQod2luZG93LT5ld2tfdmlldywgVEhFTUVfRElSICIvZGVmYXVs dC5lZGoiKTsKICAgICBpZiAoZGV2aWNlX3BpeGVsX3JhdGlvKQogICAgICAgICBld2tfdmlld19k ZXZpY2VfcGl4ZWxfcmF0aW9fc2V0KHdpbmRvdy0+ZXdrX3ZpZXcsIChmbG9hdClkZXZpY2VfcGl4 ZWxfcmF0aW8pOworICAgIGV3a192aWV3X3NvdXJjZV9tb2RlX3NldCh3aW5kb3ctPmV3a192aWV3 LCB2aWV3X21vZGUpOwogCiAgICAgLyogU2V0IHRoZSB6b29tIGxldmVsIHRvIGRlZmF1bHQgKi8K ICAgICB3aW5kb3ctPmN1cnJlbnRfem9vbV9sZXZlbCA9IERFRkFVTFRfWk9PTV9MRVZFTDsKQEAg LTEzMTcsMTAgKzEzMjIsMTAgQEAgZWxtX21haW4oaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKIAog ICAgIGlmIChhcmdzIDwgYXJnYykgewogICAgICAgICBjaGFyICp1cmwgPSB1cmxfZnJvbV91c2Vy X2lucHV0KGFyZ3ZbYXJnc10pOwotICAgICAgICB3aW5kb3cgPSB3aW5kb3dfY3JlYXRlKDAsIHVy bCwgMCwgMCk7CisgICAgICAgIHdpbmRvdyA9IHdpbmRvd19jcmVhdGUoMCwgdXJsLCAwLCAwLCBF SU5BX0ZBTFNFKTsKICAgICAgICAgZnJlZSh1cmwpOwogICAgIH0gZWxzZQotICAgICAgICB3aW5k b3cgPSB3aW5kb3dfY3JlYXRlKDAsIERFRkFVTFRfVVJMLCAwLCAwKTsKKyAgICAgICAgd2luZG93 ID0gd2luZG93X2NyZWF0ZSgwLCBERUZBVUxUX1VSTCwgMCwgMCwgRUlOQV9GQUxTRSk7CiAKICAg ICBpZiAoIXdpbmRvdykKICAgICAgICAgcmV0dXJuIHF1aXQoRUlOQV9GQUxTRSwgIkVSUk9SOiBj b3VsZCBub3QgY3JlYXRlIGJyb3dzZXIgd2luZG93LlxuIik7Cg== 183066 2013-01-16 17:11:12 -0800 2013-01-17 21:59:15 -0800 Patch bug-106633-20130117100812.patch text/plain 11560 jinwoo7.song U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5NzA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYWMxMTZmNGU2YzA2MjQw ZWZmOWI2ZTc1M2E1MTYzMTg4OTdiZWZhMy4uMDE0OTUzMTFmZGEzYTM3OTk3MTcxN2M4MTNkOGY1 MzY0NDM3YTM0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEzLTAxLTE1ICBKaW53 b28gU29uZyAgPGppbndvbzcuc29uZ0BzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJd IEFkZCBBUElzIHRvIHNldC9nZXQgdmlldyBzb3VyY2UgbW9kZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA2NjMzCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgQVBJcyB0byBzZXQvZ2V0IHZpZXcg c291cmNlIG1vZGUgZm9yIGVuYWJsaW5nIHRvIGxvYWQKKyAgICAgICAgdGhlIHNvdXJjZSBjb2Rl IG9mIHRoZSB3ZWIgcGFnZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3 LmNwcDoKKyAgICAgICAgKGV3a192aWV3X3NvdXJjZV9tb2RlX3NldCk6CisgICAgICAgIChld2tf dmlld19zb3VyY2VfbW9kZV9nZXQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a192 aWV3Lmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX3ZpZXcu Y3BwOgorICAgICAgICAoVEVTVF9GKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpXZWJQYWdlUHJveHkpOgorICAg ICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnNldE1haW5GcmFtZUluVmlld1NvdXJjZU1vZGUp OgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKFdlYktpdDo6 V2ViUGFnZVByb3h5OjptYWluRnJhbWVJblZpZXdTb3VyY2VNb2RlKToKKyAgICAgICAgKFdlYlBh Z2VQcm94eSk6CisKIDIwMTMtMDEtMTQgIERlYW4gSmFja3NvbiAgPGRpbm9AYXBwbGUuY29tPgog CiAgICAgICAgIFtBTkdMRV0gVXBkYXRlIEFOR0xFIGluIFdlYktpdApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwCmluZGV4IGVmNTIxM2VmMWE0YWQ2ZTFj ZWZmODdiNzZmNzQyNzI3NTFkNzgzMDQuLjU4NWI1YTIzM2UzNTQ1MzVlNTAzZTllODllOGNjNDM1 OTczOWUzNjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3 a192aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmll dy5jcHAKQEAgLTk4MywzICs5ODMsMTkgQEAgRWluYV9Cb29sIGV3a192aWV3X3BhZ2VfY29udGVu dHNfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0KiBld2tWaWV3LCBFd2tfUGFnZV9Db250ZW4KIAogICAg IHJldHVybiB0cnVlOwogfQorCitFaW5hX0Jvb2wgZXdrX3ZpZXdfc291cmNlX21vZGVfc2V0KEV2 YXNfT2JqZWN0KiBld2tWaWV3LCBFaW5hX0Jvb2wgZW5hYmxlZCkKK3sKKyAgICBFV0tfVklFV19J TVBMX0dFVF9PUl9SRVRVUk4oZXdrVmlldywgaW1wbCwgZmFsc2UpOworCisgICAgaW1wbC0+cGFn ZSgpLT5zZXRNYWluRnJhbWVJblZpZXdTb3VyY2VNb2RlKGVuYWJsZWQpOworCisgICAgcmV0dXJu IHRydWU7Cit9CisKK0VpbmFfQm9vbCBld2tfdmlld19zb3VyY2VfbW9kZV9nZXQoY29uc3QgRXZh c19PYmplY3QqIGV3a1ZpZXcpCit7CisgICAgRVdLX1ZJRVdfSU1QTF9HRVRfT1JfUkVUVVJOKGV3 a1ZpZXcsIGltcGwsIGZhbHNlKTsKKworICAgIHJldHVybiBpbXBsLT5wYWdlKCktPm1haW5GcmFt ZUluVmlld1NvdXJjZU1vZGUoKTsKK30KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL2V3a192aWV3LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2Vm bC9ld2tfdmlldy5oCmluZGV4IGIyZmY2NWE5NWRkOWY1MmU0OTlkYmJmMGRlNmFlMmM3ZTlmZWUw M2UuLjJhZWI3YTczNzY5YjYyM2MwYjU3OWFmYTJmNDE2NmUzMGI4NzUzYzQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmgKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaApAQCAtODcwLDYgKzg3MCwzMCBA QCBFQVBJIHZvaWQgZXdrX3ZpZXdfZHJhd3NfcGFnZV9iYWNrZ3JvdW5kX3NldChFdmFzX09iamVj dCAqbywgRWluYV9Cb29sIGVuYWJsZWQpOwogICovCiBFQVBJIEVpbmFfQm9vbCBld2tfdmlld19w YWdlX2NvbnRlbnRzX2dldChjb25zdCBFdmFzX09iamVjdCAqbywgRXdrX1BhZ2VfQ29udGVudHNf VHlwZSB0eXBlLCBFd2tfUGFnZV9Db250ZW50c19DYiBjYWxsYmFjayk7CiAKKy8qKgorICogU2V0 cyB0aGUgc291cmNlIG1vZGUgYXMgRUlOQV9UUlVFIHRvIGRpc3BsYXkgdGhlIHdlYiBzb3VyY2Ug Y29kZQorICogb3IgRUlOQV9GQUxTRSBvdGhlcndpc2UuIFRoZSBkZWZhdWx0IHZhbHVlIGlzIEVJ TkFfRkFMU0UuCisgKgorICogVGhpcyBtZXRob2Qgc2hvdWxkIGJlIGNhbGxlZCBiZWZvcmUgbG9h ZGluZyBuZXcgY29udGVudHMgb24gd2ViIHZpZXcKKyAqIHNvIHRoYXQgdGhlIG5ldyB2aWV3IG1v ZGUgd2lsbCBiZSBhcHBsaWVkIHRvIHRoZSBuZXcgY29udGVudHMuCisgKgorICogQHBhcmFtIG8g dmlldyBvYmplY3QgdG8gc2V0IHRoZSB2aWV3IHNvdXJjZSBtb2RlCisgKiBAcGFyYW0gZW5hYmxl ZCBhIHN0YXRlIHRvIHNldCB2aWV3IHNvdXJjZSBtb2RlCisgKgorICogQHJldHVybiBAYyBFSU5B X1RSVUUgb24gc3VjY2Vzcywgb3IgQGMgRUlOQV9GQUxTRSBvbiBmYWlsdXJlCisgKi8KK0VBUEkg RWluYV9Cb29sIGV3a192aWV3X3NvdXJjZV9tb2RlX3NldChFdmFzX09iamVjdCAqbywgRWluYV9C b29sIGVuYWJsZWQpOworCisvKioKKyAqIEdldHMgdGhlIHZpZXcgc291cmNlIG1vZGUgb2YgdGhl IGN1cnJlbnQgd2ViIHBhZ2UuCisgKgorICogQHBhcmFtIG8gdmlldyBvYmplY3QgdG8gZ2V0IHRo ZSB2aWV3IHNvdXJjZSBtb2RlCisgKgorICogQHJldHVybiBAYyBFSU5BX1RSVUUgaWYgdGhlIHZp ZXcgbW9kZSBpcyBzZXQgdG8gbG9hZCBzb3VyY2UgY29kZSwgb3IKKyAqICAgICAgICAgQGMgRUlO QV9GQUxTRSBvdGhlcndpc2UKKyAqLworRUFQSSBFaW5hX0Jvb2wgZXdrX3ZpZXdfc291cmNlX21v ZGVfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0ICpvKTsKKwogI2lmZGVmIF9fY3BsdXNwbHVzCiB9CiAj ZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3Rz L3Rlc3RfZXdrMl92aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rl c3RzL3Rlc3RfZXdrMl92aWV3LmNwcAppbmRleCBiMzUwOGQ0YWQ1NWExMDdjYjJlY2QzMjUyMDI2 MWMyZDZiMDhlYTNiLi5hYzg5ODIxZTc4NGQ3OTViZDNmZGQzYWY0NGY0N2QyMzM2ZjUyMzAwIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3 azJfdmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMv dGVzdF9ld2syX3ZpZXcuY3BwCkBAIC05NDUsMyArOTQ1LDI0IEBAIFRFU1RfRihFV0syVW5pdFRl c3RCYXNlLCBld2tfdmlld19wYWdlX2NvbnRlbnRzX2dldCkKICAgICB3aGlsZSAoIWlzT2J0YWlu ZWRQYWdlQ29udGVudHMpCiAgICAgICAgIGVjb3JlX21haW5fbG9vcF9pdGVyYXRlKCk7CiB9CisK K1RFU1RfRihFV0syVW5pdFRlc3RCYXNlLCBld2tfdmlld19zb3VyY2VfbW9kZSkKK3sKKyAgICBj b25zdCBjaGFyIGluZGV4SFRNTFtdID0gIjxodG1sPjxib2R5PlRlc3QgV2ViIFZpZXcgTW9kZTxz Y3JpcHQ+ZG9jdW1lbnQudGl0bGU9d2luZG93LmRvY3VtZW50LmJvZHkuaW5uZXJUZXh0Ozwvc2Ny aXB0PjwvYm9keT48L2h0bWw+IjsKKyAgICBjb25zdCBjaGFyIGNvbnRlbnRzW10gPSAiVGVzdCBX ZWIgVmlldyBNb2RlIjsKKworICAgIC8vIERlZmF1bHQgc291cmNlIG1vZGUgaXMgZmFsc2UuCisg ICAgRVhQRUNUX0ZBTFNFKGV3a192aWV3X3NvdXJjZV9tb2RlX2dldCh3ZWJWaWV3KCkpKTsKKwor ICAgIC8vIExvYWQgd2ViIGNvbnRlbnRzIG9mIHRoZSB3ZWIgcGFnZS4KKyAgICBld2tfdmlld19o dG1sX3N0cmluZ19sb2FkKHdlYlZpZXcoKSwgaW5kZXhIVE1MLCAwLCAwKTsKKyAgICBFWFBFQ1Rf VFJVRSh3YWl0VW50aWxUaXRsZUNoYW5nZWRUbyhjb250ZW50cykpOworCisgICAgRVhQRUNUX1RS VUUoZXdrX3ZpZXdfc291cmNlX21vZGVfc2V0KHdlYlZpZXcoKSwgdHJ1ZSkpOworICAgIEVYUEVD VF9UUlVFKGV3a192aWV3X3NvdXJjZV9tb2RlX2dldCh3ZWJWaWV3KCkpKTsKKworICAgIC8vIFRP RE86IEFkZCBhIHRlc3QgY2FzZSB3aGVuIHRoZSBzb3VyY2UgbW9kZSBpcyB0cnVlLgorICAgIC8v ICAgICAgIEJ1dCBpdCBuZWVkcyBhIHdheSB0byByZXRyaWV2ZSB0aGUgYm9keSBjb250ZW50cyB0 byBjb21wYXJlIHRoZSBsb2FkZWQgY29udGVudHMKKyAgICAvLyAgICAgICBzdWNoIGFzIGV4Y3V0 aW5nIHRoZSBKYXZhU2NyaXB0LCAnd2luZG93LmRvY3VtZW50LmJvZHkuaW5uZXJUZXh0Jy4KKyAg ICAvLyAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxOTA0 LgorfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5j cHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAppbmRleCAxNmUx YzdiMTU1MTIzNmQyNzU5OGMyMGE1NWMyNWUzYTNiOGJlZmIzLi4wMWVjM2IyMTc4Y2Y5YTkzZDNm MDNmNjdkYmEzMDFmMDk5ODU5NTIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmNwcApAQCAtMjM3LDYgKzIzNyw3IEBAIFdlYlBhZ2VQcm94eTo6V2ViUGFnZVByb3h5 KFBhZ2VDbGllbnQqIHBhZ2VDbGllbnQsIFBhc3NSZWZQdHI8V2ViUHJvY2Vzc1Byb3h5PiBwCiAg ICAgLCBtX21pbmltdW1MYXlvdXRXaWR0aCgwKQogICAgICwgbV9tZWRpYVZvbHVtZSgxKQogICAg ICwgbV9tYXlTdGFydE1lZGlhV2hlbkluV2luZG93KHRydWUpCisgICAgLCBtX21haW5GcmFtZUlu Vmlld1NvdXJjZU1vZGUoZmFsc2UpCiAjaWYgRU5BQkxFKFBBR0VfVklTSUJJTElUWV9BUEkpCiAg ICAgLCBtX3Zpc2liaWxpdHlTdGF0ZShQYWdlVmlzaWJpbGl0eVN0YXRlVmlzaWJsZSkKICNlbmRp ZgpAQCAtNDI2Myw5ICs0MjY0LDE1IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpjYW5jZWxDb21wb3Np dGlvbigpCiB9CiAjZW5kaWYgLy8gUExBVEZPUk0oUVQpIHx8IFBMQVRGT1JNKEdUSykKIAotdm9p ZCBXZWJQYWdlUHJveHk6OnNldE1haW5GcmFtZUluVmlld1NvdXJjZU1vZGUoYm9vbCBpblZpZXdT b3VyY2VNb2RlKQordm9pZCBXZWJQYWdlUHJveHk6OnNldE1haW5GcmFtZUluVmlld1NvdXJjZU1v ZGUoYm9vbCBtYWluRnJhbWVJblZpZXdTb3VyY2VNb2RlKQogewotICAgIG1fcHJvY2Vzcy0+c2Vu ZChNZXNzYWdlczo6V2ViUGFnZTo6U2V0TWFpbkZyYW1lSW5WaWV3U291cmNlTW9kZShpblZpZXdT b3VyY2VNb2RlKSwgbV9wYWdlSUQpOworICAgIGlmIChtX21haW5GcmFtZUluVmlld1NvdXJjZU1v ZGUgPT0gbWFpbkZyYW1lSW5WaWV3U291cmNlTW9kZSkKKyAgICAgICAgcmV0dXJuOworCisgICAg bV9tYWluRnJhbWVJblZpZXdTb3VyY2VNb2RlID0gbWFpbkZyYW1lSW5WaWV3U291cmNlTW9kZTsK KworICAgIGlmIChpc1ZhbGlkKCkpCisgICAgICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6 V2ViUGFnZTo6U2V0TWFpbkZyYW1lSW5WaWV3U291cmNlTW9kZShtYWluRnJhbWVJblZpZXdTb3Vy Y2VNb2RlKSwgbV9wYWdlSUQpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCA2ZWFmMmZmOGU2NDU2NTcwMjJjZWVj Nzk3OWYyMmJkYzM4YmQ0NWEwLi5kMmZlM2I5MmY5OWI3ODYwOTVhZWVlNmRiZDViZWYyOWE2M2Ux ZDcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBAIC03NDgsNiAr NzQ4LDcgQEAgcHVibGljOgogICAgIGRvdWJsZSBtaW5pbXVtTGF5b3V0V2lkdGgoKSBjb25zdCB7 IHJldHVybiBtX21pbmltdW1MYXlvdXRXaWR0aDsgfQogICAgIHZvaWQgc2V0TWluaW11bUxheW91 dFdpZHRoKGRvdWJsZSk7CiAKKyAgICBib29sIG1haW5GcmFtZUluVmlld1NvdXJjZU1vZGUoKSBj b25zdCB7IHJldHVybiBtX21haW5GcmFtZUluVmlld1NvdXJjZU1vZGU7IH0KICAgICB2b2lkIHNl dE1haW5GcmFtZUluVmlld1NvdXJjZU1vZGUoYm9vbCk7CiAKIHByaXZhdGU6CkBAIC0xMjMyLDYg KzEyMzMsOCBAQCBwcml2YXRlOgogICAgIGZsb2F0IG1fbWVkaWFWb2x1bWU7CiAgICAgYm9vbCBt X21heVN0YXJ0TWVkaWFXaGVuSW5XaW5kb3c7CiAKKyAgICBib29sIG1fbWFpbkZyYW1lSW5WaWV3 U291cmNlTW9kZTsKKwogI2lmIFBMQVRGT1JNKFFUKQogICAgIFdURjo6SGFzaFNldDxSZWZQdHI8 UXRSZWZDb3VudGVkTmV0d29ya1JlcXVlc3REYXRhPiA+IG1fYXBwbGljYXRpb25TY2hlbWVSZXF1 ZXN0czsKICNlbmRpZgpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdl TG9nCmluZGV4IGEyMDdmMGM4ZTNlNzE2MzM0ZDc1MTRiZjI2ZGZlNDg3MTVkZjc4ODQuLjA5MzQ1 NzVmNWZhNWUxZTZjNTA1Nzc5ZGM5NWIyMTE0ODMwNTExMjQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0No YW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMy0wMS0x NSAgSmlud29vIFNvbmcgIDxqaW53b283LnNvbmdAc2Ftc3VuZy5jb20+CisKKyAgICAgICAgW0VG TF1bV0syXSBBZGQgQVBJcyB0byBzZXQvZ2V0IHZpZXcgc291cmNlIG1vZGUKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNjYzMworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGVkIGEgc2hvdGN1dCAnRjgn IGluIE1pbmlicm93c2VyIHRvIGRpc3BsYXkgYSBzb3VyY2UgY29kZQorICAgICAgICBvZiB0aGUg d2ViIHBhZ2UgaW4gYSBuZXcgd2luZG93LgorCisgICAgICAgKiBNaW5pQnJvd3Nlci9lZmwvbWFp bi5jOgorICAgICAgICAob25fa2V5X2Rvd24pOgorICAgICAgICAob25fd2luZG93X2NyZWF0ZSk6 CisgICAgICAgICh3aW5kb3dfY3JlYXRlKToKKyAgICAgICAgKGVsbV9tYWluKToKKwogMjAxMy0w MS0xNCAgQWxhbiBDdXR0ZXIgIDxhbGFuY3V0dGVyQGNocm9taXVtLm9yZz4KIAogICAgICAgICBG aXggRVdTIEdDRSBidWlsZCBzY3JpcHRzIHRvIGRldGVjdCB3aGljaCB6b25lIGlzIGF2YWlsYWJs ZQpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYyBiL1Rvb2xzL01pbmlC cm93c2VyL2VmbC9tYWluLmMKaW5kZXggM2ZhNWI3NWVjNTA0MDAxMjQ4MmJmNDJhOTRhZjQyYzdl MGM2NGIyNC4uNzEzZWRkMzM0ZWM4NWQyZTdjMDBkMzFkMTM2ZTgwNDFmZmMzNTRmZiAxMDA2NDQK LS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYworKysgYi9Ub29scy9NaW5pQnJvd3Nl ci9lZmwvbWFpbi5jCkBAIC0xNDEsNyArMTQxLDcgQEAgc3RhdGljIGNvbnN0IEVjb3JlX0dldG9w dCBvcHRpb25zID0gewogICAgIH0KIH07CiAKLXN0YXRpYyBCcm93c2VyX1dpbmRvdyAqd2luZG93 X2NyZWF0ZShFdmFzX09iamVjdCogb3BlbmVyLCBjb25zdCBjaGFyICp1cmwsIGludCB3aWR0aCwg aW50IGhlaWdodCk7CitzdGF0aWMgQnJvd3Nlcl9XaW5kb3cgKndpbmRvd19jcmVhdGUoRXZhc19P YmplY3QqIG9wZW5lciwgY29uc3QgY2hhciAqdXJsLCBpbnQgd2lkdGgsIGludCBoZWlnaHQsIEVp bmFfQm9vbCB2aWV3X21vZGUpOwogCiBzdGF0aWMgQnJvd3Nlcl9XaW5kb3cgKndpbmRvd19maW5k X3dpdGhfZWxtX3dpbmRvdyhFdmFzX09iamVjdCAqZWxtX3dpbmRvdykKIHsKQEAgLTI5MCwxNiAr MjkwLDIwIEBAIG9uX2tleV9kb3duKHZvaWQgKnVzZXJfZGF0YSwgRXZhcyAqZSwgRXZhc19PYmpl Y3QgKmV3a192aWV3LCB2b2lkICpldmVudF9pbmZvKQogICAgIH0gZWxzZSBpZiAoIXN0cmNtcChl di0+a2V5LCAiRjYiKSkgewogICAgICAgICBpbmZvKCJTdG9wIChGNikgd2FzIHByZXNzZWQsIHN0 b3AgbG9hZGluZy5cbiIpOwogICAgICAgICBld2tfdmlld19zdG9wKGV3a192aWV3KTsKLSAgICB9 IGVsc2UgaWYgICghc3RyY21wKGV2LT5rZXksICJGNyIpKSB7CisgICAgfSBlbHNlIGlmICghc3Ry Y21wKGV2LT5rZXksICJGNyIpKSB7CiAgICAgICAgIEV3a19QYWdpbmF0aW9uX01vZGUgbW9kZSA9 ICBld2tfdmlld19wYWdpbmF0aW9uX21vZGVfZ2V0KGV3a192aWV3KTsKICAgICAgICAgbW9kZSA9 ICgrK21vZGUpICUgKEVXS19QQUdJTkFUSU9OX01PREVfQk9UVE9NX1RPX1RPUCArIDEpOwogICAg ICAgICBpZiAoZXdrX3ZpZXdfcGFnaW5hdGlvbl9tb2RlX3NldChld2tfdmlldywgbW9kZSkpCiAg ICAgICAgICAgICBpbmZvKCJDaGFuZ2UgUGFnaW5hdGlvbiBNb2RlIChGNykgd2FzIHByZXNzZWQs IGNoYW5nZWQgdG86ICVkXG4iLCBtb2RlKTsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgaW5m bygiQ2hhbmdlIFBhZ2luYXRpb24gTW9kZSAoRjcpIHdhcyBwcmVzc2VkLCBidXQgTk9UIGNoYW5n ZWQhIik7CisgICAgfSBlbHNlIGlmICghc3RyY21wKGV2LT5rZXksICJGOCIpKSB7CisgICAgICAg IGluZm8oIkNyZWF0ZSBzb3VjZSBjb2RlIHdpbmRvdyAoRjgpIHdhcyBwcmVzc2VkLlxuIik7Cisg ICAgICAgIEJyb3dzZXJfV2luZG93ICp3aW5kb3cgPSB3aW5kb3dfY3JlYXRlKGV3a192aWV3LCBl d2tfdmlld191cmxfZ2V0KGV3a192aWV3KSwgMCwgMCwgRUlOQV9UUlVFKTsKKyAgICAgICAgd2lu ZG93cyA9IGVpbmFfbGlzdF9hcHBlbmQod2luZG93cywgd2luZG93KTsKICAgICB9IGVsc2UgaWYg KCFzdHJjbXAoZXYtPmtleSwgIm4iKSAmJiBjdHJsUHJlc3NlZCkgewogICAgICAgICBpbmZvKCJD cmVhdGUgbmV3IHdpbmRvdyAoQ3RybCtuKSB3YXMgcHJlc3NlZC5cbiIpOwotICAgICAgICBCcm93 c2VyX1dpbmRvdyAqd2luZG93ID0gd2luZG93X2NyZWF0ZSgwLCBERUZBVUxUX1VSTCwgMCwgMCk7 CisgICAgICAgIEJyb3dzZXJfV2luZG93ICp3aW5kb3cgPSB3aW5kb3dfY3JlYXRlKE5VTEwsIERF RkFVTFRfVVJMLCAwLCAwLCBFSU5BX0ZBTFNFKTsKICAgICAgICAgLy8gMCBlcXVhbHMgZGVmYXVs dCB3aWR0aCBhbmQgaGVpZ2h0LgogICAgICAgICB3aW5kb3dzID0gZWluYV9saXN0X2FwcGVuZCh3 aW5kb3dzLCB3aW5kb3cpOwogICAgIH0gZWxzZSBpZiAoIXN0cmNtcChldi0+a2V5LCAiaSIpICYm IGN0cmxQcmVzc2VkKSB7CkBAIC04NzksNyArODgzLDcgQEAgb25fd2luZG93X2NyZWF0ZShFd2tf Vmlld19TbWFydF9EYXRhICpzbWFydERhdGEsIGNvbnN0IGNoYXIgKnVybCwgY29uc3QgRXdrX1dp bmQKICAgICBpZiAoIWhlaWdodCkKICAgICAgICAgaGVpZ2h0ID0gd2luZG93X2hlaWdodDsKIAot ICAgIEJyb3dzZXJfV2luZG93ICp3aW5kb3cgPSB3aW5kb3dfY3JlYXRlKHNtYXJ0RGF0YS0+c2Vs ZiwgdXJsLCB3aWR0aCwgaGVpZ2h0KTsKKyAgICBCcm93c2VyX1dpbmRvdyAqd2luZG93ID0gd2lu ZG93X2NyZWF0ZShzbWFydERhdGEtPnNlbGYsIHVybCwgd2lkdGgsIGhlaWdodCwgRUlOQV9GQUxT RSk7CiAgICAgRXZhc19PYmplY3QgKm5ld192aWV3ID0gd2luZG93LT5ld2tfdmlldzsKIAogICAg IHdpbmRvd3MgPSBlaW5hX2xpc3RfYXBwZW5kKHdpbmRvd3MsIHdpbmRvdyk7CkBAIC0xMDc0LDcg KzEwNzgsNyBAQCBjcmVhdGVfdG9vbGJhcl9idXR0b24oRXZhc19PYmplY3QgKmVsbV93aW5kb3cs IGNvbnN0IGNoYXIgKmljb25fbmFtZSkKICAgICByZXR1cm4gYnV0dG9uOwogfQogCi1zdGF0aWMg QnJvd3Nlcl9XaW5kb3cgKndpbmRvd19jcmVhdGUoRXZhc19PYmplY3QgKm9wZW5lciwgY29uc3Qg Y2hhciAqdXJsLCBpbnQgd2lkdGgsIGludCBoZWlnaHQpCitzdGF0aWMgQnJvd3Nlcl9XaW5kb3cg KndpbmRvd19jcmVhdGUoRXZhc19PYmplY3QgKm9wZW5lciwgY29uc3QgY2hhciAqdXJsLCBpbnQg d2lkdGgsIGludCBoZWlnaHQsIEVpbmFfQm9vbCB2aWV3X21vZGUpCiB7CiAgICAgQnJvd3Nlcl9X aW5kb3cgKndpbmRvdyA9IG1hbGxvYyhzaXplb2YoQnJvd3Nlcl9XaW5kb3cpKTsKICAgICBpZiAo IXdpbmRvdykgewpAQCAtMTE4Nyw2ICsxMTkxLDcgQEAgc3RhdGljIEJyb3dzZXJfV2luZG93ICp3 aW5kb3dfY3JlYXRlKEV2YXNfT2JqZWN0ICpvcGVuZXIsIGNvbnN0IGNoYXIgKnVybCwgaW50IHcK ICAgICBld2tfdmlld190aGVtZV9zZXQod2luZG93LT5ld2tfdmlldywgVEhFTUVfRElSICIvZGVm YXVsdC5lZGoiKTsKICAgICBpZiAoZGV2aWNlX3BpeGVsX3JhdGlvKQogICAgICAgICBld2tfdmll d19kZXZpY2VfcGl4ZWxfcmF0aW9fc2V0KHdpbmRvdy0+ZXdrX3ZpZXcsIChmbG9hdClkZXZpY2Vf cGl4ZWxfcmF0aW8pOworICAgIGV3a192aWV3X3NvdXJjZV9tb2RlX3NldCh3aW5kb3ctPmV3a192 aWV3LCB2aWV3X21vZGUpOwogCiAgICAgLyogU2V0IHRoZSB6b29tIGxldmVsIHRvIGRlZmF1bHQg Ki8KICAgICB3aW5kb3ctPmN1cnJlbnRfem9vbV9sZXZlbCA9IERFRkFVTFRfWk9PTV9MRVZFTDsK QEAgLTEzMTcsMTAgKzEzMjIsMTAgQEAgZWxtX21haW4oaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkK IAogICAgIGlmIChhcmdzIDwgYXJnYykgewogICAgICAgICBjaGFyICp1cmwgPSB1cmxfZnJvbV91 c2VyX2lucHV0KGFyZ3ZbYXJnc10pOwotICAgICAgICB3aW5kb3cgPSB3aW5kb3dfY3JlYXRlKDAs IHVybCwgMCwgMCk7CisgICAgICAgIHdpbmRvdyA9IHdpbmRvd19jcmVhdGUoTlVMTCwgdXJsLCAw LCAwLCBFSU5BX0ZBTFNFKTsKICAgICAgICAgZnJlZSh1cmwpOwogICAgIH0gZWxzZQotICAgICAg ICB3aW5kb3cgPSB3aW5kb3dfY3JlYXRlKDAsIERFRkFVTFRfVVJMLCAwLCAwKTsKKyAgICAgICAg d2luZG93ID0gd2luZG93X2NyZWF0ZShOVUxMLCBERUZBVUxUX1VSTCwgMCwgMCwgRUlOQV9GQUxT RSk7CiAKICAgICBpZiAoIXdpbmRvdykKICAgICAgICAgcmV0dXJuIHF1aXQoRUlOQV9GQUxTRSwg IkVSUk9SOiBjb3VsZCBub3QgY3JlYXRlIGJyb3dzZXIgd2luZG93LlxuIik7Cg== 183371 2013-01-17 21:59:23 -0800 2013-01-17 22:03:27 -0800 Patch bug-106633-20130118145621.patch text/plain 11582 jinwoo7.song U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5NzA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYWMxMTZmNGU2YzA2MjQw ZWZmOWI2ZTc1M2E1MTYzMTg4OTdiZWZhMy4uMDE0OTUzMTFmZGEzYTM3OTk3MTcxN2M4MTNkOGY1 MzY0NDM3YTM0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEzLTAxLTE1ICBKaW53 b28gU29uZyAgPGppbndvbzcuc29uZ0BzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJd IEFkZCBBUElzIHRvIHNldC9nZXQgdmlldyBzb3VyY2UgbW9kZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA2NjMzCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgQVBJcyB0byBzZXQvZ2V0IHZpZXcg c291cmNlIG1vZGUgZm9yIGVuYWJsaW5nIHRvIGxvYWQKKyAgICAgICAgdGhlIHNvdXJjZSBjb2Rl IG9mIHRoZSB3ZWIgcGFnZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3 LmNwcDoKKyAgICAgICAgKGV3a192aWV3X3NvdXJjZV9tb2RlX3NldCk6CisgICAgICAgIChld2tf dmlld19zb3VyY2VfbW9kZV9nZXQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a192 aWV3Lmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX3ZpZXcu Y3BwOgorICAgICAgICAoVEVTVF9GKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpXZWJQYWdlUHJveHkpOgorICAg ICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnNldE1haW5GcmFtZUluVmlld1NvdXJjZU1vZGUp OgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKFdlYktpdDo6 V2ViUGFnZVByb3h5OjptYWluRnJhbWVJblZpZXdTb3VyY2VNb2RlKToKKyAgICAgICAgKFdlYlBh Z2VQcm94eSk6CisKIDIwMTMtMDEtMTQgIERlYW4gSmFja3NvbiAgPGRpbm9AYXBwbGUuY29tPgog CiAgICAgICAgIFtBTkdMRV0gVXBkYXRlIEFOR0xFIGluIFdlYktpdApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwCmluZGV4IGVmNTIxM2VmMWE0YWQ2ZTFj ZWZmODdiNzZmNzQyNzI3NTFkNzgzMDQuLjU4NWI1YTIzM2UzNTQ1MzVlNTAzZTllODllOGNjNDM1 OTczOWUzNjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3 a192aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmll dy5jcHAKQEAgLTk4MywzICs5ODMsMTkgQEAgRWluYV9Cb29sIGV3a192aWV3X3BhZ2VfY29udGVu dHNfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0KiBld2tWaWV3LCBFd2tfUGFnZV9Db250ZW4KIAogICAg IHJldHVybiB0cnVlOwogfQorCitFaW5hX0Jvb2wgZXdrX3ZpZXdfc291cmNlX21vZGVfc2V0KEV2 YXNfT2JqZWN0KiBld2tWaWV3LCBFaW5hX0Jvb2wgZW5hYmxlZCkKK3sKKyAgICBFV0tfVklFV19J TVBMX0dFVF9PUl9SRVRVUk4oZXdrVmlldywgaW1wbCwgZmFsc2UpOworCisgICAgaW1wbC0+cGFn ZSgpLT5zZXRNYWluRnJhbWVJblZpZXdTb3VyY2VNb2RlKGVuYWJsZWQpOworCisgICAgcmV0dXJu IHRydWU7Cit9CisKK0VpbmFfQm9vbCBld2tfdmlld19zb3VyY2VfbW9kZV9nZXQoY29uc3QgRXZh c19PYmplY3QqIGV3a1ZpZXcpCit7CisgICAgRVdLX1ZJRVdfSU1QTF9HRVRfT1JfUkVUVVJOKGV3 a1ZpZXcsIGltcGwsIGZhbHNlKTsKKworICAgIHJldHVybiBpbXBsLT5wYWdlKCktPm1haW5GcmFt ZUluVmlld1NvdXJjZU1vZGUoKTsKK30KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL2V3a192aWV3LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2Vm bC9ld2tfdmlldy5oCmluZGV4IGIyZmY2NWE5NWRkOWY1MmU0OTlkYmJmMGRlNmFlMmM3ZTlmZWUw M2UuLjJhZWI3YTczNzY5YjYyM2MwYjU3OWFmYTJmNDE2NmUzMGI4NzUzYzQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmgKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaApAQCAtODcwLDYgKzg3MCwzMCBA QCBFQVBJIHZvaWQgZXdrX3ZpZXdfZHJhd3NfcGFnZV9iYWNrZ3JvdW5kX3NldChFdmFzX09iamVj dCAqbywgRWluYV9Cb29sIGVuYWJsZWQpOwogICovCiBFQVBJIEVpbmFfQm9vbCBld2tfdmlld19w YWdlX2NvbnRlbnRzX2dldChjb25zdCBFdmFzX09iamVjdCAqbywgRXdrX1BhZ2VfQ29udGVudHNf VHlwZSB0eXBlLCBFd2tfUGFnZV9Db250ZW50c19DYiBjYWxsYmFjayk7CiAKKy8qKgorICogU2V0 cyB0aGUgc291cmNlIG1vZGUgYXMgRUlOQV9UUlVFIHRvIGRpc3BsYXkgdGhlIHdlYiBzb3VyY2Ug Y29kZQorICogb3IgRUlOQV9GQUxTRSBvdGhlcndpc2UuIFRoZSBkZWZhdWx0IHZhbHVlIGlzIEVJ TkFfRkFMU0UuCisgKgorICogVGhpcyBtZXRob2Qgc2hvdWxkIGJlIGNhbGxlZCBiZWZvcmUgbG9h ZGluZyBuZXcgY29udGVudHMgb24gd2ViIHZpZXcKKyAqIHNvIHRoYXQgdGhlIG5ldyB2aWV3IG1v ZGUgd2lsbCBiZSBhcHBsaWVkIHRvIHRoZSBuZXcgY29udGVudHMuCisgKgorICogQHBhcmFtIG8g dmlldyBvYmplY3QgdG8gc2V0IHRoZSB2aWV3IHNvdXJjZSBtb2RlCisgKiBAcGFyYW0gZW5hYmxl ZCBhIHN0YXRlIHRvIHNldCB2aWV3IHNvdXJjZSBtb2RlCisgKgorICogQHJldHVybiBAYyBFSU5B X1RSVUUgb24gc3VjY2Vzcywgb3IgQGMgRUlOQV9GQUxTRSBvbiBmYWlsdXJlCisgKi8KK0VBUEkg RWluYV9Cb29sIGV3a192aWV3X3NvdXJjZV9tb2RlX3NldChFdmFzX09iamVjdCAqbywgRWluYV9C b29sIGVuYWJsZWQpOworCisvKioKKyAqIEdldHMgdGhlIHZpZXcgc291cmNlIG1vZGUgb2YgdGhl IGN1cnJlbnQgd2ViIHBhZ2UuCisgKgorICogQHBhcmFtIG8gdmlldyBvYmplY3QgdG8gZ2V0IHRo ZSB2aWV3IHNvdXJjZSBtb2RlCisgKgorICogQHJldHVybiBAYyBFSU5BX1RSVUUgaWYgdGhlIHZp ZXcgbW9kZSBpcyBzZXQgdG8gbG9hZCBzb3VyY2UgY29kZSwgb3IKKyAqICAgICAgICAgQGMgRUlO QV9GQUxTRSBvdGhlcndpc2UKKyAqLworRUFQSSBFaW5hX0Jvb2wgZXdrX3ZpZXdfc291cmNlX21v ZGVfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0ICpvKTsKKwogI2lmZGVmIF9fY3BsdXNwbHVzCiB9CiAj ZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3Rz L3Rlc3RfZXdrMl92aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rl c3RzL3Rlc3RfZXdrMl92aWV3LmNwcAppbmRleCBiMzUwOGQ0YWQ1NWExMDdjYjJlY2QzMjUyMDI2 MWMyZDZiMDhlYTNiLi5hYzg5ODIxZTc4NGQ3OTViZDNmZGQzYWY0NGY0N2QyMzM2ZjUyMzAwIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3 azJfdmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMv dGVzdF9ld2syX3ZpZXcuY3BwCkBAIC05NDUsMyArOTQ1LDI0IEBAIFRFU1RfRihFV0syVW5pdFRl c3RCYXNlLCBld2tfdmlld19wYWdlX2NvbnRlbnRzX2dldCkKICAgICB3aGlsZSAoIWlzT2J0YWlu ZWRQYWdlQ29udGVudHMpCiAgICAgICAgIGVjb3JlX21haW5fbG9vcF9pdGVyYXRlKCk7CiB9CisK K1RFU1RfRihFV0syVW5pdFRlc3RCYXNlLCBld2tfdmlld19zb3VyY2VfbW9kZSkKK3sKKyAgICBj b25zdCBjaGFyIGluZGV4SFRNTFtdID0gIjxodG1sPjxib2R5PlRlc3QgV2ViIFZpZXcgTW9kZTxz Y3JpcHQ+ZG9jdW1lbnQudGl0bGU9d2luZG93LmRvY3VtZW50LmJvZHkuaW5uZXJUZXh0Ozwvc2Ny aXB0PjwvYm9keT48L2h0bWw+IjsKKyAgICBjb25zdCBjaGFyIGNvbnRlbnRzW10gPSAiVGVzdCBX ZWIgVmlldyBNb2RlIjsKKworICAgIC8vIERlZmF1bHQgc291cmNlIG1vZGUgaXMgZmFsc2UuCisg ICAgRVhQRUNUX0ZBTFNFKGV3a192aWV3X3NvdXJjZV9tb2RlX2dldCh3ZWJWaWV3KCkpKTsKKwor ICAgIC8vIExvYWQgd2ViIGNvbnRlbnRzIG9mIHRoZSB3ZWIgcGFnZS4KKyAgICBld2tfdmlld19o dG1sX3N0cmluZ19sb2FkKHdlYlZpZXcoKSwgaW5kZXhIVE1MLCAwLCAwKTsKKyAgICBFWFBFQ1Rf VFJVRSh3YWl0VW50aWxUaXRsZUNoYW5nZWRUbyhjb250ZW50cykpOworCisgICAgRVhQRUNUX1RS VUUoZXdrX3ZpZXdfc291cmNlX21vZGVfc2V0KHdlYlZpZXcoKSwgdHJ1ZSkpOworICAgIEVYUEVD VF9UUlVFKGV3a192aWV3X3NvdXJjZV9tb2RlX2dldCh3ZWJWaWV3KCkpKTsKKworICAgIC8vIFRP RE86IEFkZCBhIHRlc3QgY2FzZSB3aGVuIHRoZSBzb3VyY2UgbW9kZSBpcyB0cnVlLgorICAgIC8v ICAgICAgIEJ1dCBpdCBuZWVkcyBhIHdheSB0byByZXRyaWV2ZSB0aGUgYm9keSBjb250ZW50cyB0 byBjb21wYXJlIHRoZSBsb2FkZWQgY29udGVudHMKKyAgICAvLyAgICAgICBzdWNoIGFzIGV4Y3V0 aW5nIHRoZSBKYXZhU2NyaXB0LCAnd2luZG93LmRvY3VtZW50LmJvZHkuaW5uZXJUZXh0Jy4KKyAg ICAvLyAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxOTA0 LgorfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5j cHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAppbmRleCAxNmUx YzdiMTU1MTIzNmQyNzU5OGMyMGE1NWMyNWUzYTNiOGJlZmIzLi40M2I4MjFlMmE5YTQzZTQyYTk3 NGY3MTZhMmYwNzc5NGMyZjI4OTdiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmNwcApAQCAtMjMwLDYgKzIzMCw3IEBAIFdlYlBhZ2VQcm94eTo6V2ViUGFnZVByb3h5 KFBhZ2VDbGllbnQqIHBhZ2VDbGllbnQsIFBhc3NSZWZQdHI8V2ViUHJvY2Vzc1Byb3h5PiBwCiAg ICAgLCBtX21haW5GcmFtZUlzUGlubmVkVG9SaWdodFNpZGUoZmFsc2UpCiAgICAgLCBtX21haW5G cmFtZUlzUGlubmVkVG9Ub3BTaWRlKGZhbHNlKQogICAgICwgbV9tYWluRnJhbWVJc1Bpbm5lZFRv Qm90dG9tU2lkZShmYWxzZSkKKyAgICAsIG1fbWFpbkZyYW1lSW5WaWV3U291cmNlTW9kZShmYWxz ZSkKICAgICAsIG1fcGFnZUNvdW50KDApCiAgICAgLCBtX3JlbmRlclRyZWVTaXplKDApCiAgICAg LCBtX3Nob3VsZFNlbmRFdmVudHNTeW5jaHJvbm91c2x5KGZhbHNlKQpAQCAtNDI2Myw5ICs0MjY0 LDE1IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpjYW5jZWxDb21wb3NpdGlvbigpCiB9CiAjZW5kaWYg Ly8gUExBVEZPUk0oUVQpIHx8IFBMQVRGT1JNKEdUSykKIAotdm9pZCBXZWJQYWdlUHJveHk6OnNl dE1haW5GcmFtZUluVmlld1NvdXJjZU1vZGUoYm9vbCBpblZpZXdTb3VyY2VNb2RlKQordm9pZCBX ZWJQYWdlUHJveHk6OnNldE1haW5GcmFtZUluVmlld1NvdXJjZU1vZGUoYm9vbCBtYWluRnJhbWVJ blZpZXdTb3VyY2VNb2RlKQogewotICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFn ZTo6U2V0TWFpbkZyYW1lSW5WaWV3U291cmNlTW9kZShpblZpZXdTb3VyY2VNb2RlKSwgbV9wYWdl SUQpOworICAgIGlmIChtX21haW5GcmFtZUluVmlld1NvdXJjZU1vZGUgPT0gbWFpbkZyYW1lSW5W aWV3U291cmNlTW9kZSkKKyAgICAgICAgcmV0dXJuOworCisgICAgbV9tYWluRnJhbWVJblZpZXdT b3VyY2VNb2RlID0gbWFpbkZyYW1lSW5WaWV3U291cmNlTW9kZTsKKworICAgIGlmIChpc1ZhbGlk KCkpCisgICAgICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6U2V0TWFpbkZy YW1lSW5WaWV3U291cmNlTW9kZShtYWluRnJhbWVJblZpZXdTb3VyY2VNb2RlKSwgbV9wYWdlSUQp OwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuaAppbmRleCA2ZWFmMmZmOGU2NDU2NTcwMjJjZWVjNzk3OWYyMmJkYzM4YmQ0NWEw Li40OThhMjQ1ZDFjMjE3ODUzYmEwNjJhZWYxNzQxNWI2M2Y3MGJkZDg2IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBAIC03NDgsNiArNzQ4LDcgQEAgcHVibGljOgog ICAgIGRvdWJsZSBtaW5pbXVtTGF5b3V0V2lkdGgoKSBjb25zdCB7IHJldHVybiBtX21pbmltdW1M YXlvdXRXaWR0aDsgfQogICAgIHZvaWQgc2V0TWluaW11bUxheW91dFdpZHRoKGRvdWJsZSk7CiAK KyAgICBib29sIG1haW5GcmFtZUluVmlld1NvdXJjZU1vZGUoKSBjb25zdCB7IHJldHVybiBtX21h aW5GcmFtZUluVmlld1NvdXJjZU1vZGU7IH0KICAgICB2b2lkIHNldE1haW5GcmFtZUluVmlld1Nv dXJjZU1vZGUoYm9vbCk7CiAKIHByaXZhdGU6CkBAIC0xMjE2LDYgKzEyMTcsOCBAQCBwcml2YXRl OgogICAgIGJvb2wgbV9tYWluRnJhbWVJc1Bpbm5lZFRvVG9wU2lkZTsKICAgICBib29sIG1fbWFp bkZyYW1lSXNQaW5uZWRUb0JvdHRvbVNpZGU7CiAKKyAgICBib29sIG1fbWFpbkZyYW1lSW5WaWV3 U291cmNlTW9kZTsKKwogICAgIHVuc2lnbmVkIG1fcGFnZUNvdW50OwogCiAgICAgV2ViQ29yZTo6 SW50UmVjdCBtX3Zpc2libGVTY3JvbGxlclRodW1iUmVjdDsKZGlmZiAtLWdpdCBhL1Rvb2xzL0No YW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBhMjA3ZjBjOGUzZTcxNjMzNGQ3NTE0YmYy NmRmZTQ4NzE1ZGY3ODg0Li4wOTM0NTc1ZjVmYTVlMWU2YzUwNTc3OWRjOTViMjExNDgzMDUxMTI0 IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTkgQEAKKzIwMTMtMDEtMTUgIEppbndvbyBTb25nICA8amlud29vNy5zb25nQHNhbXN1 bmcuY29tPgorCisgICAgICAgIFtFRkxdW1dLMl0gQWRkIEFQSXMgdG8gc2V0L2dldCB2aWV3IHNv dXJjZSBtb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMDY2MzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBZGRlZCBhIHNob3RjdXQgJ0Y4JyBpbiBNaW5pYnJvd3NlciB0byBkaXNwbGF5IGEgc291cmNl IGNvZGUKKyAgICAgICAgb2YgdGhlIHdlYiBwYWdlIGluIGEgbmV3IHdpbmRvdy4KKworICAgICAg ICogTWluaUJyb3dzZXIvZWZsL21haW4uYzoKKyAgICAgICAgKG9uX2tleV9kb3duKToKKyAgICAg ICAgKG9uX3dpbmRvd19jcmVhdGUpOgorICAgICAgICAod2luZG93X2NyZWF0ZSk6CisgICAgICAg IChlbG1fbWFpbik6CisKIDIwMTMtMDEtMTQgIEFsYW4gQ3V0dGVyICA8YWxhbmN1dHRlckBjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgRml4IEVXUyBHQ0UgYnVpbGQgc2NyaXB0cyB0byBkZXRlY3Qg d2hpY2ggem9uZSBpcyBhdmFpbGFibGUKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL2Vm bC9tYWluLmMgYi9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jCmluZGV4IDNmYTViNzVlYzUw NDAwMTI0ODJiZjQyYTk0YWY0MmM3ZTBjNjRiMjQuLjcxM2VkZDMzNGVjODVkMmU3YzAwZDMxZDEz NmU4MDQxZmZjMzU0ZmYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMK KysrIGIvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYwpAQCAtMTQxLDcgKzE0MSw3IEBAIHN0 YXRpYyBjb25zdCBFY29yZV9HZXRvcHQgb3B0aW9ucyA9IHsKICAgICB9CiB9OwogCi1zdGF0aWMg QnJvd3Nlcl9XaW5kb3cgKndpbmRvd19jcmVhdGUoRXZhc19PYmplY3QqIG9wZW5lciwgY29uc3Qg Y2hhciAqdXJsLCBpbnQgd2lkdGgsIGludCBoZWlnaHQpOworc3RhdGljIEJyb3dzZXJfV2luZG93 ICp3aW5kb3dfY3JlYXRlKEV2YXNfT2JqZWN0KiBvcGVuZXIsIGNvbnN0IGNoYXIgKnVybCwgaW50 IHdpZHRoLCBpbnQgaGVpZ2h0LCBFaW5hX0Jvb2wgdmlld19tb2RlKTsKIAogc3RhdGljIEJyb3dz ZXJfV2luZG93ICp3aW5kb3dfZmluZF93aXRoX2VsbV93aW5kb3coRXZhc19PYmplY3QgKmVsbV93 aW5kb3cpCiB7CkBAIC0yOTAsMTYgKzI5MCwyMCBAQCBvbl9rZXlfZG93bih2b2lkICp1c2VyX2Rh dGEsIEV2YXMgKmUsIEV2YXNfT2JqZWN0ICpld2tfdmlldywgdm9pZCAqZXZlbnRfaW5mbykKICAg ICB9IGVsc2UgaWYgKCFzdHJjbXAoZXYtPmtleSwgIkY2IikpIHsKICAgICAgICAgaW5mbygiU3Rv cCAoRjYpIHdhcyBwcmVzc2VkLCBzdG9wIGxvYWRpbmcuXG4iKTsKICAgICAgICAgZXdrX3ZpZXdf c3RvcChld2tfdmlldyk7Ci0gICAgfSBlbHNlIGlmICAoIXN0cmNtcChldi0+a2V5LCAiRjciKSkg eworICAgIH0gZWxzZSBpZiAoIXN0cmNtcChldi0+a2V5LCAiRjciKSkgewogICAgICAgICBFd2tf UGFnaW5hdGlvbl9Nb2RlIG1vZGUgPSAgZXdrX3ZpZXdfcGFnaW5hdGlvbl9tb2RlX2dldChld2tf dmlldyk7CiAgICAgICAgIG1vZGUgPSAoKyttb2RlKSAlIChFV0tfUEFHSU5BVElPTl9NT0RFX0JP VFRPTV9UT19UT1AgKyAxKTsKICAgICAgICAgaWYgKGV3a192aWV3X3BhZ2luYXRpb25fbW9kZV9z ZXQoZXdrX3ZpZXcsIG1vZGUpKQogICAgICAgICAgICAgaW5mbygiQ2hhbmdlIFBhZ2luYXRpb24g TW9kZSAoRjcpIHdhcyBwcmVzc2VkLCBjaGFuZ2VkIHRvOiAlZFxuIiwgbW9kZSk7CiAgICAgICAg IGVsc2UKICAgICAgICAgICAgIGluZm8oIkNoYW5nZSBQYWdpbmF0aW9uIE1vZGUgKEY3KSB3YXMg cHJlc3NlZCwgYnV0IE5PVCBjaGFuZ2VkISIpOworICAgIH0gZWxzZSBpZiAoIXN0cmNtcChldi0+ a2V5LCAiRjgiKSkgeworICAgICAgICBpbmZvKCJDcmVhdGUgc291Y2UgY29kZSB3aW5kb3cgKEY4 KSB3YXMgcHJlc3NlZC5cbiIpOworICAgICAgICBCcm93c2VyX1dpbmRvdyAqd2luZG93ID0gd2lu ZG93X2NyZWF0ZShld2tfdmlldywgZXdrX3ZpZXdfdXJsX2dldChld2tfdmlldyksIDAsIDAsIEVJ TkFfVFJVRSk7CisgICAgICAgIHdpbmRvd3MgPSBlaW5hX2xpc3RfYXBwZW5kKHdpbmRvd3MsIHdp bmRvdyk7CiAgICAgfSBlbHNlIGlmICghc3RyY21wKGV2LT5rZXksICJuIikgJiYgY3RybFByZXNz ZWQpIHsKICAgICAgICAgaW5mbygiQ3JlYXRlIG5ldyB3aW5kb3cgKEN0cmwrbikgd2FzIHByZXNz ZWQuXG4iKTsKLSAgICAgICAgQnJvd3Nlcl9XaW5kb3cgKndpbmRvdyA9IHdpbmRvd19jcmVhdGUo MCwgREVGQVVMVF9VUkwsIDAsIDApOworICAgICAgICBCcm93c2VyX1dpbmRvdyAqd2luZG93ID0g d2luZG93X2NyZWF0ZShOVUxMLCBERUZBVUxUX1VSTCwgMCwgMCwgRUlOQV9GQUxTRSk7CiAgICAg ICAgIC8vIDAgZXF1YWxzIGRlZmF1bHQgd2lkdGggYW5kIGhlaWdodC4KICAgICAgICAgd2luZG93 cyA9IGVpbmFfbGlzdF9hcHBlbmQod2luZG93cywgd2luZG93KTsKICAgICB9IGVsc2UgaWYgKCFz dHJjbXAoZXYtPmtleSwgImkiKSAmJiBjdHJsUHJlc3NlZCkgewpAQCAtODc5LDcgKzg4Myw3IEBA IG9uX3dpbmRvd19jcmVhdGUoRXdrX1ZpZXdfU21hcnRfRGF0YSAqc21hcnREYXRhLCBjb25zdCBj aGFyICp1cmwsIGNvbnN0IEV3a19XaW5kCiAgICAgaWYgKCFoZWlnaHQpCiAgICAgICAgIGhlaWdo dCA9IHdpbmRvd19oZWlnaHQ7CiAKLSAgICBCcm93c2VyX1dpbmRvdyAqd2luZG93ID0gd2luZG93 X2NyZWF0ZShzbWFydERhdGEtPnNlbGYsIHVybCwgd2lkdGgsIGhlaWdodCk7CisgICAgQnJvd3Nl cl9XaW5kb3cgKndpbmRvdyA9IHdpbmRvd19jcmVhdGUoc21hcnREYXRhLT5zZWxmLCB1cmwsIHdp ZHRoLCBoZWlnaHQsIEVJTkFfRkFMU0UpOwogICAgIEV2YXNfT2JqZWN0ICpuZXdfdmlldyA9IHdp bmRvdy0+ZXdrX3ZpZXc7CiAKICAgICB3aW5kb3dzID0gZWluYV9saXN0X2FwcGVuZCh3aW5kb3dz LCB3aW5kb3cpOwpAQCAtMTA3NCw3ICsxMDc4LDcgQEAgY3JlYXRlX3Rvb2xiYXJfYnV0dG9uKEV2 YXNfT2JqZWN0ICplbG1fd2luZG93LCBjb25zdCBjaGFyICppY29uX25hbWUpCiAgICAgcmV0dXJu IGJ1dHRvbjsKIH0KIAotc3RhdGljIEJyb3dzZXJfV2luZG93ICp3aW5kb3dfY3JlYXRlKEV2YXNf T2JqZWN0ICpvcGVuZXIsIGNvbnN0IGNoYXIgKnVybCwgaW50IHdpZHRoLCBpbnQgaGVpZ2h0KQor c3RhdGljIEJyb3dzZXJfV2luZG93ICp3aW5kb3dfY3JlYXRlKEV2YXNfT2JqZWN0ICpvcGVuZXIs IGNvbnN0IGNoYXIgKnVybCwgaW50IHdpZHRoLCBpbnQgaGVpZ2h0LCBFaW5hX0Jvb2wgdmlld19t b2RlKQogewogICAgIEJyb3dzZXJfV2luZG93ICp3aW5kb3cgPSBtYWxsb2Moc2l6ZW9mKEJyb3dz ZXJfV2luZG93KSk7CiAgICAgaWYgKCF3aW5kb3cpIHsKQEAgLTExODcsNiArMTE5MSw3IEBAIHN0 YXRpYyBCcm93c2VyX1dpbmRvdyAqd2luZG93X2NyZWF0ZShFdmFzX09iamVjdCAqb3BlbmVyLCBj b25zdCBjaGFyICp1cmwsIGludCB3CiAgICAgZXdrX3ZpZXdfdGhlbWVfc2V0KHdpbmRvdy0+ZXdr X3ZpZXcsIFRIRU1FX0RJUiAiL2RlZmF1bHQuZWRqIik7CiAgICAgaWYgKGRldmljZV9waXhlbF9y YXRpbykKICAgICAgICAgZXdrX3ZpZXdfZGV2aWNlX3BpeGVsX3JhdGlvX3NldCh3aW5kb3ctPmV3 a192aWV3LCAoZmxvYXQpZGV2aWNlX3BpeGVsX3JhdGlvKTsKKyAgICBld2tfdmlld19zb3VyY2Vf bW9kZV9zZXQod2luZG93LT5ld2tfdmlldywgdmlld19tb2RlKTsKIAogICAgIC8qIFNldCB0aGUg em9vbSBsZXZlbCB0byBkZWZhdWx0ICovCiAgICAgd2luZG93LT5jdXJyZW50X3pvb21fbGV2ZWwg PSBERUZBVUxUX1pPT01fTEVWRUw7CkBAIC0xMzE3LDEwICsxMzIyLDEwIEBAIGVsbV9tYWluKGlu dCBhcmdjLCBjaGFyICphcmd2W10pCiAKICAgICBpZiAoYXJncyA8IGFyZ2MpIHsKICAgICAgICAg Y2hhciAqdXJsID0gdXJsX2Zyb21fdXNlcl9pbnB1dChhcmd2W2FyZ3NdKTsKLSAgICAgICAgd2lu ZG93ID0gd2luZG93X2NyZWF0ZSgwLCB1cmwsIDAsIDApOworICAgICAgICB3aW5kb3cgPSB3aW5k b3dfY3JlYXRlKE5VTEwsIHVybCwgMCwgMCwgRUlOQV9GQUxTRSk7CiAgICAgICAgIGZyZWUodXJs KTsKICAgICB9IGVsc2UKLSAgICAgICAgd2luZG93ID0gd2luZG93X2NyZWF0ZSgwLCBERUZBVUxU X1VSTCwgMCwgMCk7CisgICAgICAgIHdpbmRvdyA9IHdpbmRvd19jcmVhdGUoTlVMTCwgREVGQVVM VF9VUkwsIDAsIDAsIEVJTkFfRkFMU0UpOwogCiAgICAgaWYgKCF3aW5kb3cpCiAgICAgICAgIHJl dHVybiBxdWl0KEVJTkFfRkFMU0UsICJFUlJPUjogY291bGQgbm90IGNyZWF0ZSBicm93c2VyIHdp bmRvdy5cbiIpOwo= 183372 2013-01-17 22:03:36 -0800 2013-01-21 17:54:16 -0800 Patch bug-106633-20130118150034.patch text/plain 11578 jinwoo7.song U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5NzA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYWMxMTZmNGU2YzA2MjQw ZWZmOWI2ZTc1M2E1MTYzMTg4OTdiZWZhMy4uOTEyMjlhNDg0ODg0OGZmYWM4NjA0OTViMDYzZmQ5 YjA4ZGY0NzRjNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEzLTAxLTE1ICBKaW53 b28gU29uZyAgPGppbndvbzcuc29uZ0BzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJd IEFkZCBBUElzIHRvIHNldC9nZXQgdmlldyBzb3VyY2UgbW9kZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA2NjMzCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgR3l1eW91bmcgS2ltLgorCisgICAgICAgIEFkZGVkIEFQSXMgdG8gc2V0L2dldCB2aWV3IHNv dXJjZSBtb2RlIGZvciBlbmFibGluZyB0byBsb2FkCisgICAgICAgIHRoZSBzb3VyY2UgY29kZSBv ZiB0aGUgd2ViIHBhZ2UuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5j cHA6CisgICAgICAgIChld2tfdmlld19zb3VyY2VfbW9kZV9zZXQpOgorICAgICAgICAoZXdrX3Zp ZXdfc291cmNlX21vZGVfZ2V0KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmll dy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl92aWV3LmNw cDoKKyAgICAgICAgKFRFU1RfRik6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5j cHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6V2ViUGFnZVByb3h5KToKKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpzZXRNYWluRnJhbWVJblZpZXdTb3VyY2VNb2RlKToK KyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAgIChXZWJLaXQ6Oldl YlBhZ2VQcm94eTo6bWFpbkZyYW1lSW5WaWV3U291cmNlTW9kZSk6CisgICAgICAgIChXZWJQYWdl UHJveHkpOgorCiAyMDEzLTAxLTE0ICBEZWFuIEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KIAog ICAgICAgICBbQU5HTEVdIFVwZGF0ZSBBTkdMRSBpbiBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcAppbmRleCBlZjUyMTNlZjFhNGFkNmUxY2Vm Zjg3Yjc2Zjc0MjcyNzUxZDc4MzA0Li41ODViNWEyMzNlMzU0NTM1ZTUwM2U5ZTg5ZThjYzQzNTk3 MzllMzY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tf dmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcu Y3BwCkBAIC05ODMsMyArOTgzLDE5IEBAIEVpbmFfQm9vbCBld2tfdmlld19wYWdlX2NvbnRlbnRz X2dldChjb25zdCBFdmFzX09iamVjdCogZXdrVmlldywgRXdrX1BhZ2VfQ29udGVuCiAKICAgICBy ZXR1cm4gdHJ1ZTsKIH0KKworRWluYV9Cb29sIGV3a192aWV3X3NvdXJjZV9tb2RlX3NldChFdmFz X09iamVjdCogZXdrVmlldywgRWluYV9Cb29sIGVuYWJsZWQpCit7CisgICAgRVdLX1ZJRVdfSU1Q TF9HRVRfT1JfUkVUVVJOKGV3a1ZpZXcsIGltcGwsIGZhbHNlKTsKKworICAgIGltcGwtPnBhZ2Uo KS0+c2V0TWFpbkZyYW1lSW5WaWV3U291cmNlTW9kZShlbmFibGVkKTsKKworICAgIHJldHVybiB0 cnVlOworfQorCitFaW5hX0Jvb2wgZXdrX3ZpZXdfc291cmNlX21vZGVfZ2V0KGNvbnN0IEV2YXNf T2JqZWN0KiBld2tWaWV3KQoreworICAgIEVXS19WSUVXX0lNUExfR0VUX09SX1JFVFVSTihld2tW aWV3LCBpbXBsLCBmYWxzZSk7CisKKyAgICByZXR1cm4gaW1wbC0+cGFnZSgpLT5tYWluRnJhbWVJ blZpZXdTb3VyY2VNb2RlKCk7Cit9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2VmbC9ld2tfdmlldy5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX3ZpZXcuaAppbmRleCBiMmZmNjVhOTVkZDlmNTJlNDk5ZGJiZjBkZTZhZTJjN2U5ZmVlMDNl Li4yYWViN2E3Mzc2OWI2MjNjMGI1NzlhZmEyZjQxNjZlMzBiODc1M2M0IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmgKQEAgLTg3MCw2ICs4NzAsMzAgQEAg RUFQSSB2b2lkIGV3a192aWV3X2RyYXdzX3BhZ2VfYmFja2dyb3VuZF9zZXQoRXZhc19PYmplY3Qg Km8sIEVpbmFfQm9vbCBlbmFibGVkKTsKICAqLwogRUFQSSBFaW5hX0Jvb2wgZXdrX3ZpZXdfcGFn ZV9jb250ZW50c19nZXQoY29uc3QgRXZhc19PYmplY3QgKm8sIEV3a19QYWdlX0NvbnRlbnRzX1R5 cGUgdHlwZSwgRXdrX1BhZ2VfQ29udGVudHNfQ2IgY2FsbGJhY2spOwogCisvKioKKyAqIFNldHMg dGhlIHNvdXJjZSBtb2RlIGFzIEVJTkFfVFJVRSB0byBkaXNwbGF5IHRoZSB3ZWIgc291cmNlIGNv ZGUKKyAqIG9yIEVJTkFfRkFMU0Ugb3RoZXJ3aXNlLiBUaGUgZGVmYXVsdCB2YWx1ZSBpcyBFSU5B X0ZBTFNFLgorICoKKyAqIFRoaXMgbWV0aG9kIHNob3VsZCBiZSBjYWxsZWQgYmVmb3JlIGxvYWRp bmcgbmV3IGNvbnRlbnRzIG9uIHdlYiB2aWV3CisgKiBzbyB0aGF0IHRoZSBuZXcgdmlldyBtb2Rl IHdpbGwgYmUgYXBwbGllZCB0byB0aGUgbmV3IGNvbnRlbnRzLgorICoKKyAqIEBwYXJhbSBvIHZp ZXcgb2JqZWN0IHRvIHNldCB0aGUgdmlldyBzb3VyY2UgbW9kZQorICogQHBhcmFtIGVuYWJsZWQg YSBzdGF0ZSB0byBzZXQgdmlldyBzb3VyY2UgbW9kZQorICoKKyAqIEByZXR1cm4gQGMgRUlOQV9U UlVFIG9uIHN1Y2Nlc3MsIG9yIEBjIEVJTkFfRkFMU0Ugb24gZmFpbHVyZQorICovCitFQVBJIEVp bmFfQm9vbCBld2tfdmlld19zb3VyY2VfbW9kZV9zZXQoRXZhc19PYmplY3QgKm8sIEVpbmFfQm9v bCBlbmFibGVkKTsKKworLyoqCisgKiBHZXRzIHRoZSB2aWV3IHNvdXJjZSBtb2RlIG9mIHRoZSBj dXJyZW50IHdlYiBwYWdlLgorICoKKyAqIEBwYXJhbSBvIHZpZXcgb2JqZWN0IHRvIGdldCB0aGUg dmlldyBzb3VyY2UgbW9kZQorICoKKyAqIEByZXR1cm4gQGMgRUlOQV9UUlVFIGlmIHRoZSB2aWV3 IG1vZGUgaXMgc2V0IHRvIGxvYWQgc291cmNlIGNvZGUsIG9yCisgKiAgICAgICAgIEBjIEVJTkFf RkFMU0Ugb3RoZXJ3aXNlCisgKi8KK0VBUEkgRWluYV9Cb29sIGV3a192aWV3X3NvdXJjZV9tb2Rl X2dldChjb25zdCBFdmFzX09iamVjdCAqbyk7CisKICNpZmRlZiBfX2NwbHVzcGx1cwogfQogI2Vu ZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90 ZXN0X2V3azJfdmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0 cy90ZXN0X2V3azJfdmlldy5jcHAKaW5kZXggYjM1MDhkNGFkNTVhMTA3Y2IyZWNkMzI1MjAyNjFj MmQ2YjA4ZWEzYi4uYWM4OTgyMWU3ODRkNzk1YmQzZmRkM2FmNDRmNDdkMjMzNmY1MjMwMCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2sy X3ZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rl c3RfZXdrMl92aWV3LmNwcApAQCAtOTQ1LDMgKzk0NSwyNCBAQCBURVNUX0YoRVdLMlVuaXRUZXN0 QmFzZSwgZXdrX3ZpZXdfcGFnZV9jb250ZW50c19nZXQpCiAgICAgd2hpbGUgKCFpc09idGFpbmVk UGFnZUNvbnRlbnRzKQogICAgICAgICBlY29yZV9tYWluX2xvb3BfaXRlcmF0ZSgpOwogfQorCitU RVNUX0YoRVdLMlVuaXRUZXN0QmFzZSwgZXdrX3ZpZXdfc291cmNlX21vZGUpCit7CisgICAgY29u c3QgY2hhciBpbmRleEhUTUxbXSA9ICI8aHRtbD48Ym9keT5UZXN0IFdlYiBWaWV3IE1vZGU8c2Ny aXB0PmRvY3VtZW50LnRpdGxlPXdpbmRvdy5kb2N1bWVudC5ib2R5LmlubmVyVGV4dDs8L3Njcmlw dD48L2JvZHk+PC9odG1sPiI7CisgICAgY29uc3QgY2hhciBjb250ZW50c1tdID0gIlRlc3QgV2Vi IFZpZXcgTW9kZSI7CisKKyAgICAvLyBEZWZhdWx0IHNvdXJjZSBtb2RlIGlzIGZhbHNlLgorICAg IEVYUEVDVF9GQUxTRShld2tfdmlld19zb3VyY2VfbW9kZV9nZXQod2ViVmlldygpKSk7CisKKyAg ICAvLyBMb2FkIHdlYiBjb250ZW50cyBvZiB0aGUgd2ViIHBhZ2UuCisgICAgZXdrX3ZpZXdfaHRt bF9zdHJpbmdfbG9hZCh3ZWJWaWV3KCksIGluZGV4SFRNTCwgMCwgMCk7CisgICAgRVhQRUNUX1RS VUUod2FpdFVudGlsVGl0bGVDaGFuZ2VkVG8oY29udGVudHMpKTsKKworICAgIEVYUEVDVF9UUlVF KGV3a192aWV3X3NvdXJjZV9tb2RlX3NldCh3ZWJWaWV3KCksIHRydWUpKTsKKyAgICBFWFBFQ1Rf VFJVRShld2tfdmlld19zb3VyY2VfbW9kZV9nZXQod2ViVmlldygpKSk7CisKKyAgICAvLyBUT0RP OiBBZGQgYSB0ZXN0IGNhc2Ugd2hlbiB0aGUgc291cmNlIG1vZGUgaXMgdHJ1ZS4KKyAgICAvLyAg ICAgICBCdXQgaXQgbmVlZHMgYSB3YXkgdG8gcmV0cmlldmUgdGhlIGJvZHkgY29udGVudHMgdG8g Y29tcGFyZSB0aGUgbG9hZGVkIGNvbnRlbnRzCisgICAgLy8gICAgICAgc3VjaCBhcyBleGN1dGlu ZyB0aGUgSmF2YVNjcmlwdCwgJ3dpbmRvdy5kb2N1bWVudC5ib2R5LmlubmVyVGV4dCcuCisgICAg Ly8gICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMTkwNC4K K30KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3Bw IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggMTZlMWM3 YjE1NTEyMzZkMjc1OThjMjBhNTVjMjVlM2EzYjhiZWZiMy4uNDNiODIxZTJhOWE0M2U0MmE5NzRm NzE2YTJmMDc3OTRjMmYyODk3YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5jcHAKQEAgLTIzMCw2ICsyMzAsNyBAQCBXZWJQYWdlUHJveHk6OldlYlBhZ2VQcm94eShQ YWdlQ2xpZW50KiBwYWdlQ2xpZW50LCBQYXNzUmVmUHRyPFdlYlByb2Nlc3NQcm94eT4gcAogICAg ICwgbV9tYWluRnJhbWVJc1Bpbm5lZFRvUmlnaHRTaWRlKGZhbHNlKQogICAgICwgbV9tYWluRnJh bWVJc1Bpbm5lZFRvVG9wU2lkZShmYWxzZSkKICAgICAsIG1fbWFpbkZyYW1lSXNQaW5uZWRUb0Jv dHRvbVNpZGUoZmFsc2UpCisgICAgLCBtX21haW5GcmFtZUluVmlld1NvdXJjZU1vZGUoZmFsc2Up CiAgICAgLCBtX3BhZ2VDb3VudCgwKQogICAgICwgbV9yZW5kZXJUcmVlU2l6ZSgwKQogICAgICwg bV9zaG91bGRTZW5kRXZlbnRzU3luY2hyb25vdXNseShmYWxzZSkKQEAgLTQyNjMsOSArNDI2NCwx NSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6Y2FuY2VsQ29tcG9zaXRpb24oKQogfQogI2VuZGlmIC8v IFBMQVRGT1JNKFFUKSB8fCBQTEFURk9STShHVEspCiAKLXZvaWQgV2ViUGFnZVByb3h5OjpzZXRN YWluRnJhbWVJblZpZXdTb3VyY2VNb2RlKGJvb2wgaW5WaWV3U291cmNlTW9kZSkKK3ZvaWQgV2Vi UGFnZVByb3h5OjpzZXRNYWluRnJhbWVJblZpZXdTb3VyY2VNb2RlKGJvb2wgbWFpbkZyYW1lSW5W aWV3U291cmNlTW9kZSkKIHsKLSAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6 OlNldE1haW5GcmFtZUluVmlld1NvdXJjZU1vZGUoaW5WaWV3U291cmNlTW9kZSksIG1fcGFnZUlE KTsKKyAgICBpZiAobV9tYWluRnJhbWVJblZpZXdTb3VyY2VNb2RlID09IG1haW5GcmFtZUluVmll d1NvdXJjZU1vZGUpCisgICAgICAgIHJldHVybjsKKworICAgIG1fbWFpbkZyYW1lSW5WaWV3U291 cmNlTW9kZSA9IG1haW5GcmFtZUluVmlld1NvdXJjZU1vZGU7CisKKyAgICBpZiAoaXNWYWxpZCgp KQorICAgICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlNldE1haW5GcmFt ZUluVmlld1NvdXJjZU1vZGUobWFpbkZyYW1lSW5WaWV3U291cmNlTW9kZSksIG1fcGFnZUlEKTsK IH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViUGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmgKaW5kZXggNmVhZjJmZjhlNjQ1NjU3MDIyY2VlYzc5NzlmMjJiZGMzOGJkNDVhMC4u NDk4YTI0NWQxYzIxNzg1M2JhMDYyYWVmMTc0MTViNjNmNzBiZGQ4NiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaApAQCAtNzQ4LDYgKzc0OCw3IEBAIHB1YmxpYzoKICAg ICBkb3VibGUgbWluaW11bUxheW91dFdpZHRoKCkgY29uc3QgeyByZXR1cm4gbV9taW5pbXVtTGF5 b3V0V2lkdGg7IH0KICAgICB2b2lkIHNldE1pbmltdW1MYXlvdXRXaWR0aChkb3VibGUpOwogCisg ICAgYm9vbCBtYWluRnJhbWVJblZpZXdTb3VyY2VNb2RlKCkgY29uc3QgeyByZXR1cm4gbV9tYWlu RnJhbWVJblZpZXdTb3VyY2VNb2RlOyB9CiAgICAgdm9pZCBzZXRNYWluRnJhbWVJblZpZXdTb3Vy Y2VNb2RlKGJvb2wpOwogCiBwcml2YXRlOgpAQCAtMTIxNiw2ICsxMjE3LDggQEAgcHJpdmF0ZToK ICAgICBib29sIG1fbWFpbkZyYW1lSXNQaW5uZWRUb1RvcFNpZGU7CiAgICAgYm9vbCBtX21haW5G cmFtZUlzUGlubmVkVG9Cb3R0b21TaWRlOwogCisgICAgYm9vbCBtX21haW5GcmFtZUluVmlld1Nv dXJjZU1vZGU7CisKICAgICB1bnNpZ25lZCBtX3BhZ2VDb3VudDsKIAogICAgIFdlYkNvcmU6Oklu dFJlY3QgbV92aXNpYmxlU2Nyb2xsZXJUaHVtYlJlY3Q7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFu Z2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTIwN2YwYzhlM2U3MTYzMzRkNzUxNGJmMjZk ZmU0ODcxNWRmNzg4NC4uMjZlNjVhM2Q5NjBhYzhmYTIxMmZkN2FiYjlhYzA4MjNjNGJlMmM4YiAx MDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE5IEBACisyMDEzLTAxLTE1ICBKaW53b28gU29uZyAgPGppbndvbzcuc29uZ0BzYW1zdW5n LmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIEFkZCBBUElzIHRvIHNldC9nZXQgdmlldyBzb3Vy Y2UgbW9kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTA2NjMzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgR3l1eW91bmcgS2ltLgorCisgICAgICAgIEFk ZGVkIGEgc2hvdGN1dCAnRjgnIGluIE1pbmlicm93c2VyIHRvIGRpc3BsYXkgYSBzb3VyY2UgY29k ZQorICAgICAgICBvZiB0aGUgd2ViIHBhZ2UgaW4gYSBuZXcgd2luZG93LgorCisgICAgICAgKiBN aW5pQnJvd3Nlci9lZmwvbWFpbi5jOgorICAgICAgICAob25fa2V5X2Rvd24pOgorICAgICAgICAo b25fd2luZG93X2NyZWF0ZSk6CisgICAgICAgICh3aW5kb3dfY3JlYXRlKToKKyAgICAgICAgKGVs bV9tYWluKToKKwogMjAxMy0wMS0xNCAgQWxhbiBDdXR0ZXIgIDxhbGFuY3V0dGVyQGNocm9taXVt Lm9yZz4KIAogICAgICAgICBGaXggRVdTIEdDRSBidWlsZCBzY3JpcHRzIHRvIGRldGVjdCB3aGlj aCB6b25lIGlzIGF2YWlsYWJsZQpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21h aW4uYyBiL1Rvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMKaW5kZXggM2ZhNWI3NWVjNTA0MDAx MjQ4MmJmNDJhOTRhZjQyYzdlMGM2NGIyNC4uNzEzZWRkMzM0ZWM4NWQyZTdjMDBkMzFkMTM2ZTgw NDFmZmMzNTRmZiAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYworKysg Yi9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jCkBAIC0xNDEsNyArMTQxLDcgQEAgc3RhdGlj IGNvbnN0IEVjb3JlX0dldG9wdCBvcHRpb25zID0gewogICAgIH0KIH07CiAKLXN0YXRpYyBCcm93 c2VyX1dpbmRvdyAqd2luZG93X2NyZWF0ZShFdmFzX09iamVjdCogb3BlbmVyLCBjb25zdCBjaGFy ICp1cmwsIGludCB3aWR0aCwgaW50IGhlaWdodCk7CitzdGF0aWMgQnJvd3Nlcl9XaW5kb3cgKndp bmRvd19jcmVhdGUoRXZhc19PYmplY3QqIG9wZW5lciwgY29uc3QgY2hhciAqdXJsLCBpbnQgd2lk dGgsIGludCBoZWlnaHQsIEVpbmFfQm9vbCB2aWV3X21vZGUpOwogCiBzdGF0aWMgQnJvd3Nlcl9X aW5kb3cgKndpbmRvd19maW5kX3dpdGhfZWxtX3dpbmRvdyhFdmFzX09iamVjdCAqZWxtX3dpbmRv dykKIHsKQEAgLTI5MCwxNiArMjkwLDIwIEBAIG9uX2tleV9kb3duKHZvaWQgKnVzZXJfZGF0YSwg RXZhcyAqZSwgRXZhc19PYmplY3QgKmV3a192aWV3LCB2b2lkICpldmVudF9pbmZvKQogICAgIH0g ZWxzZSBpZiAoIXN0cmNtcChldi0+a2V5LCAiRjYiKSkgewogICAgICAgICBpbmZvKCJTdG9wIChG Nikgd2FzIHByZXNzZWQsIHN0b3AgbG9hZGluZy5cbiIpOwogICAgICAgICBld2tfdmlld19zdG9w KGV3a192aWV3KTsKLSAgICB9IGVsc2UgaWYgICghc3RyY21wKGV2LT5rZXksICJGNyIpKSB7Cisg ICAgfSBlbHNlIGlmICghc3RyY21wKGV2LT5rZXksICJGNyIpKSB7CiAgICAgICAgIEV3a19QYWdp bmF0aW9uX01vZGUgbW9kZSA9ICBld2tfdmlld19wYWdpbmF0aW9uX21vZGVfZ2V0KGV3a192aWV3 KTsKICAgICAgICAgbW9kZSA9ICgrK21vZGUpICUgKEVXS19QQUdJTkFUSU9OX01PREVfQk9UVE9N X1RPX1RPUCArIDEpOwogICAgICAgICBpZiAoZXdrX3ZpZXdfcGFnaW5hdGlvbl9tb2RlX3NldChl d2tfdmlldywgbW9kZSkpCiAgICAgICAgICAgICBpbmZvKCJDaGFuZ2UgUGFnaW5hdGlvbiBNb2Rl IChGNykgd2FzIHByZXNzZWQsIGNoYW5nZWQgdG86ICVkXG4iLCBtb2RlKTsKICAgICAgICAgZWxz ZQogICAgICAgICAgICAgaW5mbygiQ2hhbmdlIFBhZ2luYXRpb24gTW9kZSAoRjcpIHdhcyBwcmVz c2VkLCBidXQgTk9UIGNoYW5nZWQhIik7CisgICAgfSBlbHNlIGlmICghc3RyY21wKGV2LT5rZXks ICJGOCIpKSB7CisgICAgICAgIGluZm8oIkNyZWF0ZSBzb3VjZSBjb2RlIHdpbmRvdyAoRjgpIHdh cyBwcmVzc2VkLlxuIik7CisgICAgICAgIEJyb3dzZXJfV2luZG93ICp3aW5kb3cgPSB3aW5kb3df Y3JlYXRlKGV3a192aWV3LCBld2tfdmlld191cmxfZ2V0KGV3a192aWV3KSwgMCwgMCwgRUlOQV9U UlVFKTsKKyAgICAgICAgd2luZG93cyA9IGVpbmFfbGlzdF9hcHBlbmQod2luZG93cywgd2luZG93 KTsKICAgICB9IGVsc2UgaWYgKCFzdHJjbXAoZXYtPmtleSwgIm4iKSAmJiBjdHJsUHJlc3NlZCkg ewogICAgICAgICBpbmZvKCJDcmVhdGUgbmV3IHdpbmRvdyAoQ3RybCtuKSB3YXMgcHJlc3NlZC5c biIpOwotICAgICAgICBCcm93c2VyX1dpbmRvdyAqd2luZG93ID0gd2luZG93X2NyZWF0ZSgwLCBE RUZBVUxUX1VSTCwgMCwgMCk7CisgICAgICAgIEJyb3dzZXJfV2luZG93ICp3aW5kb3cgPSB3aW5k b3dfY3JlYXRlKE5VTEwsIERFRkFVTFRfVVJMLCAwLCAwLCBFSU5BX0ZBTFNFKTsKICAgICAgICAg Ly8gMCBlcXVhbHMgZGVmYXVsdCB3aWR0aCBhbmQgaGVpZ2h0LgogICAgICAgICB3aW5kb3dzID0g ZWluYV9saXN0X2FwcGVuZCh3aW5kb3dzLCB3aW5kb3cpOwogICAgIH0gZWxzZSBpZiAoIXN0cmNt cChldi0+a2V5LCAiaSIpICYmIGN0cmxQcmVzc2VkKSB7CkBAIC04NzksNyArODgzLDcgQEAgb25f d2luZG93X2NyZWF0ZShFd2tfVmlld19TbWFydF9EYXRhICpzbWFydERhdGEsIGNvbnN0IGNoYXIg KnVybCwgY29uc3QgRXdrX1dpbmQKICAgICBpZiAoIWhlaWdodCkKICAgICAgICAgaGVpZ2h0ID0g d2luZG93X2hlaWdodDsKIAotICAgIEJyb3dzZXJfV2luZG93ICp3aW5kb3cgPSB3aW5kb3dfY3Jl YXRlKHNtYXJ0RGF0YS0+c2VsZiwgdXJsLCB3aWR0aCwgaGVpZ2h0KTsKKyAgICBCcm93c2VyX1dp bmRvdyAqd2luZG93ID0gd2luZG93X2NyZWF0ZShzbWFydERhdGEtPnNlbGYsIHVybCwgd2lkdGgs IGhlaWdodCwgRUlOQV9GQUxTRSk7CiAgICAgRXZhc19PYmplY3QgKm5ld192aWV3ID0gd2luZG93 LT5ld2tfdmlldzsKIAogICAgIHdpbmRvd3MgPSBlaW5hX2xpc3RfYXBwZW5kKHdpbmRvd3MsIHdp bmRvdyk7CkBAIC0xMDc0LDcgKzEwNzgsNyBAQCBjcmVhdGVfdG9vbGJhcl9idXR0b24oRXZhc19P YmplY3QgKmVsbV93aW5kb3csIGNvbnN0IGNoYXIgKmljb25fbmFtZSkKICAgICByZXR1cm4gYnV0 dG9uOwogfQogCi1zdGF0aWMgQnJvd3Nlcl9XaW5kb3cgKndpbmRvd19jcmVhdGUoRXZhc19PYmpl Y3QgKm9wZW5lciwgY29uc3QgY2hhciAqdXJsLCBpbnQgd2lkdGgsIGludCBoZWlnaHQpCitzdGF0 aWMgQnJvd3Nlcl9XaW5kb3cgKndpbmRvd19jcmVhdGUoRXZhc19PYmplY3QgKm9wZW5lciwgY29u c3QgY2hhciAqdXJsLCBpbnQgd2lkdGgsIGludCBoZWlnaHQsIEVpbmFfQm9vbCB2aWV3X21vZGUp CiB7CiAgICAgQnJvd3Nlcl9XaW5kb3cgKndpbmRvdyA9IG1hbGxvYyhzaXplb2YoQnJvd3Nlcl9X aW5kb3cpKTsKICAgICBpZiAoIXdpbmRvdykgewpAQCAtMTE4Nyw2ICsxMTkxLDcgQEAgc3RhdGlj IEJyb3dzZXJfV2luZG93ICp3aW5kb3dfY3JlYXRlKEV2YXNfT2JqZWN0ICpvcGVuZXIsIGNvbnN0 IGNoYXIgKnVybCwgaW50IHcKICAgICBld2tfdmlld190aGVtZV9zZXQod2luZG93LT5ld2tfdmll dywgVEhFTUVfRElSICIvZGVmYXVsdC5lZGoiKTsKICAgICBpZiAoZGV2aWNlX3BpeGVsX3JhdGlv KQogICAgICAgICBld2tfdmlld19kZXZpY2VfcGl4ZWxfcmF0aW9fc2V0KHdpbmRvdy0+ZXdrX3Zp ZXcsIChmbG9hdClkZXZpY2VfcGl4ZWxfcmF0aW8pOworICAgIGV3a192aWV3X3NvdXJjZV9tb2Rl X3NldCh3aW5kb3ctPmV3a192aWV3LCB2aWV3X21vZGUpOwogCiAgICAgLyogU2V0IHRoZSB6b29t IGxldmVsIHRvIGRlZmF1bHQgKi8KICAgICB3aW5kb3ctPmN1cnJlbnRfem9vbV9sZXZlbCA9IERF RkFVTFRfWk9PTV9MRVZFTDsKQEAgLTEzMTcsMTAgKzEzMjIsMTAgQEAgZWxtX21haW4oaW50IGFy Z2MsIGNoYXIgKmFyZ3ZbXSkKIAogICAgIGlmIChhcmdzIDwgYXJnYykgewogICAgICAgICBjaGFy ICp1cmwgPSB1cmxfZnJvbV91c2VyX2lucHV0KGFyZ3ZbYXJnc10pOwotICAgICAgICB3aW5kb3cg PSB3aW5kb3dfY3JlYXRlKDAsIHVybCwgMCwgMCk7CisgICAgICAgIHdpbmRvdyA9IHdpbmRvd19j cmVhdGUoTlVMTCwgdXJsLCAwLCAwLCBFSU5BX0ZBTFNFKTsKICAgICAgICAgZnJlZSh1cmwpOwog ICAgIH0gZWxzZQotICAgICAgICB3aW5kb3cgPSB3aW5kb3dfY3JlYXRlKDAsIERFRkFVTFRfVVJM LCAwLCAwKTsKKyAgICAgICAgd2luZG93ID0gd2luZG93X2NyZWF0ZShOVUxMLCBERUZBVUxUX1VS TCwgMCwgMCwgRUlOQV9GQUxTRSk7CiAKICAgICBpZiAoIXdpbmRvdykKICAgICAgICAgcmV0dXJu IHF1aXQoRUlOQV9GQUxTRSwgIkVSUk9SOiBjb3VsZCBub3QgY3JlYXRlIGJyb3dzZXIgd2luZG93 LlxuIik7Cg==