38554 2010-05-04 16:29:53 -0700 [Qt] The image plugin used for decoding images should be configurable 2014-02-03 03:16:28 -0800 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) PC OS X 10.5 RESOLVED INVALID Qt, QtTriaged P2 Enhancement --- 1 benjamin webkit-unassigned diegohcg jturcotte oldest_to_newest 220864 0 benjamin 2010-05-04 16:29:53 -0700 Currently, all the images plugins can be used to decode images. That can be a security issue, one might want to avoid some image formats when decoding images from the Web: Tiff, SVG (see https://bugs.webkit.org/show_bug.cgi?id=37826), mng for example. We could add an API in QWebSettings to name explicitly the plugins that can be loaded: QWebSettings::disableAutoImageLoading() QWebSettings::enableImagePlugin("jpg"); 385966 1 89629 igor.oliveira 2011-04-14 12:52:05 -0700 Created attachment 89629 Initial implementation of configurable images loading. Add initial implementation of configurable images auto loading. Right now i am just handling png and jpeg and the public api will be changed. 387541 2 89629 tonikitoo 2011-04-17 22:21:38 -0700 Comment on attachment 89629 Initial implementation of configurable images loading. View in context: https://bugs.webkit.org/attachment.cgi?id=89629&action=review > Source/WebCore/page/Settings.cpp:57 > + for (Frame* frame = page->mainFrame(); frame; frame = frame->tree()->traverseNext()) > + frame->document()->cachedResourceLoader()->setLoadJPEGImage(page->settings()->loadsSiteJPEGImagesIgnoringImageLoadingSetting()); this could be called outside the loop. page->settings()->loadsSiteJPEGImagesIgnoringImageLoadingSetting() > Source/WebCore/page/Settings.cpp:63 > + for (Frame* frame = page->mainFrame(); frame; frame = frame->tree()->traverseNext()) > + frame->document()->cachedResourceLoader()->setLoadPNGImage(page->settings()->loadsSitePNGImagesIgnoringImageLoadingSetting()); Ditto > Source/WebKit/qt/Api/qwebsettings.cpp:630 > +void QWebSettings::enableLoadingImage(const QString &image) & positioned wrong. The goal should be clean, and comments are needed. > Source/WebKit/qt/Api/qwebsettings.cpp:638 > + if (image == QLatin1String("jpeg")) > + d->settings->setLoadsSiteJPEGImagesIgnoringImageLoadingSetting(true); > + else if(image == QLatin1String("png")) > + d->settings->setLoadsSitePNGImagesIgnoringImageLoadingSetting(true); Only caring about these two formats? 975124 3 jturcotte 2014-02-03 03:16:28 -0800 === Bulk closing of Qt bugs === If you believe that this bug report is still relevant for a non-Qt port of webkit.org, please re-open it and remove [Qt] from the summary. If you believe that this is still an important QtWebKit bug, please fill a new report at https://bugreports.qt-project.org and add a link to this issue. See http://qt-project.org/wiki/ReportingBugsInQt for additional guidelines. 89629 2011-04-14 12:52:05 -0700 2011-04-17 22:21:38 -0700 Initial implementation of configurable images loading. 0001-WIP.patch text/plain 8656 igor.oliveira RnJvbSBkYzZiOGIxZDY1MjA2OTUyNzk4YWM0YWZmYzJmNTU4OTU3N2UwZDgxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBJZ29yIE9saXZlaXJhIDxpZ29yLm9saXZlaXJhQG9wZW5ib3Nz YS5vcmc+CkRhdGU6IFRodSwgMTQgQXByIDIwMTEgMTU6Mzk6MzYgLTA0MDAKU3ViamVjdDogW1BB VENIXSBXSVAKCi0tLQogLi4uL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9h ZGVyLmNwcCAgfCAgIDQxICsrKysrKysrKysrKysrKysrKysrCiBTb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuaCB8ICAgMTQgKysrKysrLQogU291cmNlL1dl YkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAgICAgICAgICAgICAgICAgICAgfCAgIDI4ICsrKysrKysr KysrKystCiBTb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmggICAgICAgICAgICAgICAgICAg ICB8ICAgMTAgKysrKysKIFNvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5jcHAgICAg ICAgICAgICAgIHwgICAxMSArKysrKwogU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdz LmggICAgICAgICAgICAgICAgfCAgICAyICsKIDYgZmlsZXMgY2hhbmdlZCwgMTAzIGluc2VydGlv bnMoKyksIDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVy L2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9j YWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHAKaW5kZXggZjc4MGM2Yy4uNGNmYWNkNyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVy LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2Fk ZXIuY3BwCkBAIC01MTUsNiArNTE1LDQ3IEBAIHZvaWQgQ2FjaGVkUmVzb3VyY2VMb2FkZXI6OnNl dEF1dG9Mb2FkSW1hZ2VzKGJvb2wgZW5hYmxlKQogICAgIH0KIH0KIAordm9pZCBDYWNoZWRSZXNv dXJjZUxvYWRlcjo6bG9hZEltYWdlV2l0aE1pbWVUeXBlKGNvbnN0IFN0cmluZyYgbWltZVR5cGUp Cit7CisgICAgRG9jdW1lbnRSZXNvdXJjZU1hcDo6aXRlcmF0b3IgZW5kID0gbV9kb2N1bWVudFJl c291cmNlcy5lbmQoKTsKKyAgICBmb3IgKERvY3VtZW50UmVzb3VyY2VNYXA6Oml0ZXJhdG9yIGl0 ID0gbV9kb2N1bWVudFJlc291cmNlcy5iZWdpbigpOyBpdCAhPSBlbmQ7ICsraXQpIHsKKyAgICAg ICAgQ2FjaGVkUmVzb3VyY2UqIHJlc291cmNlID0gaXQtPnNlY29uZC5nZXQoKTsKKyAgICAgICAg aWYgKHJlc291cmNlLT50eXBlKCkgPT0gQ2FjaGVkUmVzb3VyY2U6OkltYWdlUmVzb3VyY2UKKyAg ICAgICAgICAgICYmIHJlc291cmNlLT5yZXNwb25zZSgpLm1pbWVUeXBlKCkgPT0gbWltZVR5cGUp IHsKKyAgICAgICAgICAgIENhY2hlZEltYWdlKiBpbWFnZSA9IGNvbnN0X2Nhc3Q8Q2FjaGVkSW1h Z2UqPihzdGF0aWNfY2FzdDxjb25zdCBDYWNoZWRJbWFnZSo+KHJlc291cmNlKSk7CisKKyAgICAg ICAgICAgIGlmIChpbWFnZS0+c3RpbGxOZWVkc0xvYWQoKSkKKyAgICAgICAgICAgICAgICBsb2Fk KGltYWdlLCB0cnVlKTsKKyAgICAgICAgfQorICAgIH0KK30KKwordm9pZCBDYWNoZWRSZXNvdXJj ZUxvYWRlcjo6c2V0TG9hZEpQRUdJbWFnZShib29sIGVuYWJsZSkKK3sKKyAgICBpZiAoZW5hYmxl ID09IG1fbG9hZEpQRUdJbWFnZSkKKyAgICAgICAgcmV0dXJuOworCisgICAgbV9sb2FkSlBFR0lt YWdlID0gZW5hYmxlOworCisgICAgaWYgKCFtX2xvYWRKUEVHSW1hZ2UgJiYgbV9hdXRvTG9hZElt YWdlcykKKyAgICAgICAgcmV0dXJuOworCisgICAgbG9hZEltYWdlV2l0aE1pbWVUeXBlKCJpbWFn ZS9qcGVnIik7Cit9CisKK3ZvaWQgQ2FjaGVkUmVzb3VyY2VMb2FkZXI6OnNldExvYWRQTkdJbWFn ZShib29sIGVuYWJsZSkKK3sKKyAgICBpZiAoZW5hYmxlID09IG1fbG9hZFBOR0ltYWdlKQorICAg ICAgICByZXR1cm47CisKKyAgICBtX2xvYWRQTkdJbWFnZSA9IGVuYWJsZTsKKworICAgIGlmICgh bV9sb2FkUE5HSW1hZ2UgJiYgbV9hdXRvTG9hZEltYWdlcykKKyAgICAgICAgcmV0dXJuOworCisg ICAgbG9hZEltYWdlV2l0aE1pbWVUeXBlKCJpbWFnZS9wbmciKTsKK30KKwogQ2FjaGVQb2xpY3kg Q2FjaGVkUmVzb3VyY2VMb2FkZXI6OmNhY2hlUG9saWN5KCkgY29uc3QKIHsKICAgICByZXR1cm4g ZnJhbWUoKSA/IGZyYW1lKCktPmxvYWRlcigpLT5zdWJyZXNvdXJjZUNhY2hlUG9saWN5KCkgOiBD YWNoZVBvbGljeVZlcmlmeTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNo ZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0Nh Y2hlZFJlc291cmNlTG9hZGVyLmgKaW5kZXggMmQ2YjFkMi4uMmNjOWRjNyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmgKKysrIGIv U291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmgKQEAgLTgz LDcgKzgzLDE1IEBAIHB1YmxpYzoKIAogICAgIGJvb2wgYXV0b0xvYWRJbWFnZXMoKSBjb25zdCB7 IHJldHVybiBtX2F1dG9Mb2FkSW1hZ2VzOyB9CiAgICAgdm9pZCBzZXRBdXRvTG9hZEltYWdlcyhi b29sKTsKLSAgICAKKworICAgIHZvaWQgbG9hZEltYWdlV2l0aE1pbWVUeXBlKGNvbnN0IFN0cmlu ZyYpOworCisgICAgYm9vbCBsb2FkSlBFR0ltYWdlKCkgY29uc3QgeyByZXR1cm4gbV9sb2FkSlBF R0ltYWdlOyB9CisgICAgdm9pZCBzZXRMb2FkSlBFR0ltYWdlKGJvb2wpOworCisgICAgYm9vbCBs b2FkUE5HSW1hZ2UoKSBjb25zdCB7IHJldHVybiBtX2xvYWRQTkdJbWFnZTsgfQorICAgIHZvaWQg c2V0TG9hZFBOR0ltYWdlKGJvb2wpOworCiAgICAgQ2FjaGVQb2xpY3kgY2FjaGVQb2xpY3koKSBj b25zdDsKICAgICAKICAgICBGcmFtZSogZnJhbWUoKSBjb25zdDsgLy8gQ2FuIGJlIE5VTEwKQEAg LTE0MiwxMSArMTUwLDEzIEBAIHByaXZhdGU6CiAgICAgRGVxdWU8UGVuZGluZ1ByZWxvYWQ+IG1f cGVuZGluZ1ByZWxvYWRzOwogCiAgICAgVGltZXI8Q2FjaGVkUmVzb3VyY2VMb2FkZXI+IG1fbG9h ZERvbmVBY3Rpb25UaW1lcjsKLSAgICAKKwogICAgIC8vMjkgYml0cyBsZWZ0CiAgICAgYm9vbCBt X2F1dG9Mb2FkSW1hZ2VzIDogMTsKICAgICBib29sIG1fbG9hZEZpbmlzaGluZyA6IDE7CiAgICAg Ym9vbCBtX2FsbG93U3RhbGVSZXNvdXJjZXMgOiAxOworICAgIGJvb2wgbV9sb2FkSlBFR0ltYWdl OiAxOworICAgIGJvb2wgbV9sb2FkUE5HSW1hZ2U6IDE7CiB9OwogCiB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0 dGluZ3MuY3BwCmluZGV4IGRkN2VkODkuLjUxMDcyYzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BhZ2UvU2V0dGluZ3MuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3Mu Y3BwCkBAIC01MSw2ICs1MSwxOCBAQCBzdGF0aWMgdm9pZCBzZXRMb2Fkc0ltYWdlc0F1dG9tYXRp Y2FsbHlJbkFsbEZyYW1lcyhQYWdlKiBwYWdlKQogICAgICAgICBmcmFtZS0+ZG9jdW1lbnQoKS0+ Y2FjaGVkUmVzb3VyY2VMb2FkZXIoKS0+c2V0QXV0b0xvYWRJbWFnZXMocGFnZS0+c2V0dGluZ3Mo KS0+bG9hZHNJbWFnZXNBdXRvbWF0aWNhbGx5KCkpOwogfQogCitzdGF0aWMgdm9pZCBzZXRMb2Fk c0pQRUdJbWFnZXNJbkFsbEZyYW1lcyhQYWdlKiBwYWdlKQoreworICAgIGZvciAoRnJhbWUqIGZy YW1lID0gcGFnZS0+bWFpbkZyYW1lKCk7IGZyYW1lOyBmcmFtZSA9IGZyYW1lLT50cmVlKCktPnRy YXZlcnNlTmV4dCgpKQorICAgICAgICBmcmFtZS0+ZG9jdW1lbnQoKS0+Y2FjaGVkUmVzb3VyY2VM b2FkZXIoKS0+c2V0TG9hZEpQRUdJbWFnZShwYWdlLT5zZXR0aW5ncygpLT5sb2Fkc1NpdGVKUEVH SW1hZ2VzSWdub3JpbmdJbWFnZUxvYWRpbmdTZXR0aW5nKCkpOworfQorCitzdGF0aWMgdm9pZCBz ZXRMb2Fkc1BOR0ltYWdlc0luQWxsRnJhbWVzKFBhZ2UqIHBhZ2UpCit7CisgICAgZm9yIChGcmFt ZSogZnJhbWUgPSBwYWdlLT5tYWluRnJhbWUoKTsgZnJhbWU7IGZyYW1lID0gZnJhbWUtPnRyZWUo KS0+dHJhdmVyc2VOZXh0KCkpCisgICAgICAgIGZyYW1lLT5kb2N1bWVudCgpLT5jYWNoZWRSZXNv dXJjZUxvYWRlcigpLT5zZXRMb2FkUE5HSW1hZ2UocGFnZS0+c2V0dGluZ3MoKS0+bG9hZHNTaXRl UE5HSW1hZ2VzSWdub3JpbmdJbWFnZUxvYWRpbmdTZXR0aW5nKCkpOworfQorCiAjaWYgVVNFKFNB RkFSSV9USEVNRSkKIGJvb2wgU2V0dGluZ3M6OmdTaG91bGRQYWludE5hdGl2ZUNvbnRyb2xzID0g dHJ1ZTsKICNlbmRpZgpAQCAtMTc0LDggKzE4NiwxMCBAQCBTZXR0aW5nczo6U2V0dGluZ3MoUGFn ZSogcGFnZSkKICAgICAsIG1fdXNlUXVpY2tMb29rUmVzb3VyY2VDYWNoaW5nUXVpcmtzKGZhbHNl KQogICAgICwgbV9mb3JjZUNvbXBvc2l0aW5nTW9kZShmYWxzZSkKICAgICAsIG1fc2hvdWxkSW5q ZWN0VXNlclNjcmlwdHNJbkluaXRpYWxFbXB0eURvY3VtZW50KGZhbHNlKQorICAgICwgbV9sb2Fk SlBFR0ltYWdlc0lnbm9yaW5nSW1hZ2VBdXRvTG9hZGluZ1NldHRpbmdzKGZhbHNlKQorICAgICwg bV9sb2FkUE5HSW1hZ2VzSWdub3JpbmdJbWFnZUF1dG9Mb2FkaW5nU2V0dGluZ3MoZmFsc2UpCiB7 Ci0gICAgLy8gQSBGcmFtZSBtYXkgbm90IGhhdmUgYmVlbiBjcmVhdGVkIHlldCwgc28gd2UgaW5p dGlhbGl6ZSB0aGUgQXRvbWljU3RyaW5nIAorICAgIC8vIEEgRnJhbWUgbWF5IG5vdCBoYXZlIGJl ZW4gY3JlYXRlZCB5ZXQsIHNvIHdlIGluaXRpYWxpemUgdGhlIEF0b21pY1N0cmluZwogICAgIC8v IGhhc2ggYmVmb3JlIHRyeWluZyB0byB1c2UgaXQuCiAgICAgQXRvbWljU3RyaW5nOjppbml0KCk7 CiB9CkBAIC0yODEsNiArMjk1LDE4IEBAIHZvaWQgU2V0dGluZ3M6OnNldExvYWRzU2l0ZUljb25z SWdub3JpbmdJbWFnZUxvYWRpbmdTZXR0aW5nKGJvb2wgbG9hZHNTaXRlSWNvbnMpCiAgICAgbV9s b2Fkc1NpdGVJY29uc0lnbm9yaW5nSW1hZ2VMb2FkaW5nU2V0dGluZyA9IGxvYWRzU2l0ZUljb25z OwogfQogCit2b2lkIFNldHRpbmdzOjpzZXRMb2Fkc1NpdGVQTkdJbWFnZXNJZ25vcmluZ0ltYWdl TG9hZGluZ1NldHRpbmcoYm9vbCBsb2Fkc1NpdGVQTkcpCit7CisgICAgbV9sb2FkUE5HSW1hZ2Vz SWdub3JpbmdJbWFnZUF1dG9Mb2FkaW5nU2V0dGluZ3MgPSBsb2Fkc1NpdGVQTkc7CisgICAgc2V0 TG9hZHNQTkdJbWFnZXNJbkFsbEZyYW1lcyhtX3BhZ2UpOworfQorCit2b2lkIFNldHRpbmdzOjpz ZXRMb2Fkc1NpdGVKUEVHSW1hZ2VzSWdub3JpbmdJbWFnZUxvYWRpbmdTZXR0aW5nKGJvb2wgbG9h ZHNTaXRlSlBFRykKK3sKKyAgICBtX2xvYWRKUEVHSW1hZ2VzSWdub3JpbmdJbWFnZUF1dG9Mb2Fk aW5nU2V0dGluZ3MgPSBsb2Fkc1NpdGVKUEVHOworICAgIHNldExvYWRzSlBFR0ltYWdlc0luQWxs RnJhbWVzKG1fcGFnZSk7Cit9CisKIHZvaWQgU2V0dGluZ3M6OnNldEphdmFTY3JpcHRFbmFibGVk KGJvb2wgaXNKYXZhU2NyaXB0RW5hYmxlZCkKIHsKICAgICBtX2lzSmF2YVNjcmlwdEVuYWJsZWQg PSBpc0phdmFTY3JpcHRFbmFibGVkOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9T ZXR0aW5ncy5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5oCmluZGV4IDVkNjk0NTIu LjAwNTliYTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmgKQEAgLTk1LDYgKzk1LDE0IEBAIG5hbWVz cGFjZSBXZWJDb3JlIHsKICAgICAgICAgdm9pZCBzZXRMb2Fkc1NpdGVJY29uc0lnbm9yaW5nSW1h Z2VMb2FkaW5nU2V0dGluZyhib29sKTsKICAgICAgICAgYm9vbCBsb2Fkc1NpdGVJY29uc0lnbm9y aW5nSW1hZ2VMb2FkaW5nU2V0dGluZygpIGNvbnN0IHsgcmV0dXJuIG1fbG9hZHNTaXRlSWNvbnNJ Z25vcmluZ0ltYWdlTG9hZGluZ1NldHRpbmc7IH0KIAorCS8vIFRoaXMgc2V0dGluZyBvbmx5IGFm ZmVjdHMgc2l0ZSBwbmcgaW1hZ2UgbG9hZGluZyBpZiBsb2Fkc0ltYWdlc0F1dG9tYXRpY2FsbHkg c2V0dGluZyBpcyBmYWxzZSBhbmQgdGhpcyBzZXR0aW5nIGlzIHRydWUuCisJdm9pZCBzZXRMb2Fk c1NpdGVQTkdJbWFnZXNJZ25vcmluZ0ltYWdlTG9hZGluZ1NldHRpbmcoYm9vbCk7CisJYm9vbCBs b2Fkc1NpdGVQTkdJbWFnZXNJZ25vcmluZ0ltYWdlTG9hZGluZ1NldHRpbmcoKSBjb25zdCB7IHJl dHVybiBtX2xvYWRQTkdJbWFnZXNJZ25vcmluZ0ltYWdlQXV0b0xvYWRpbmdTZXR0aW5nczsgfQor CisJLy8gVGhpcyBzZXR0aW5nIG9ubHkgYWZmZWN0cyBzaXRlIGpwZWcgaW1hZ2UgbG9hZGluZyBp ZiBsb2Fkc0ltYWdlc0F1dG9tYXRpY2FsbHkgc2V0dGluZyBpcyBmYWxzZSBhbmQgdGhpcyBzZXR0 aW5nIGlzIHRydWUuCisJdm9pZCBzZXRMb2Fkc1NpdGVKUEVHSW1hZ2VzSWdub3JpbmdJbWFnZUxv YWRpbmdTZXR0aW5nKGJvb2wpOworCWJvb2wgbG9hZHNTaXRlSlBFR0ltYWdlc0lnbm9yaW5nSW1h Z2VMb2FkaW5nU2V0dGluZygpIGNvbnN0IHsgcmV0dXJuIG1fbG9hZEpQRUdJbWFnZXNJZ25vcmlu Z0ltYWdlQXV0b0xvYWRpbmdTZXR0aW5nczsgfQorCiAgICAgICAgIHZvaWQgc2V0SmF2YVNjcmlw dEVuYWJsZWQoYm9vbCk7CiAgICAgICAgIC8vIEluc3RlYWQgb2YgY2FsbGluZyBpc0phdmFTY3Jp cHRFbmFibGVkIGRpcmVjdGx5LCBwbGVhc2UgY29uc2lkZXIgY2FsbGluZwogICAgICAgICAvLyBT Y3JpcHRDb250cm9sbGVyOjpjYW5FeGVjdXRlU2NyaXB0cywgd2hpY2ggdGFrZXMgdGhpbmdzIGxp a2UgdGhlCkBAIC00OTcsNiArNTA1LDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBi b29sIG1fdXNlUXVpY2tMb29rUmVzb3VyY2VDYWNoaW5nUXVpcmtzIDogMTsKICAgICAgICAgYm9v bCBtX2ZvcmNlQ29tcG9zaXRpbmdNb2RlIDogMTsKICAgICAgICAgYm9vbCBtX3Nob3VsZEluamVj dFVzZXJTY3JpcHRzSW5Jbml0aWFsRW1wdHlEb2N1bWVudCA6IDE7CisgICAgICAgIGJvb2wgbV9s b2FkSlBFR0ltYWdlc0lnbm9yaW5nSW1hZ2VBdXRvTG9hZGluZ1NldHRpbmdzIDogMTsKKwlib29s IG1fbG9hZFBOR0ltYWdlc0lnbm9yaW5nSW1hZ2VBdXRvTG9hZGluZ1NldHRpbmdzOiAxOwogCiAj aWYgVVNFKFNBRkFSSV9USEVNRSkKICAgICAgICAgc3RhdGljIGJvb2wgZ1Nob3VsZFBhaW50TmF0 aXZlQ29udHJvbHM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2Vic2V0dGlu Z3MuY3BwIGIvU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmNwcAppbmRleCBmNzQ0 ZTgxLi5iYmFhZWVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2Vic2V0dGlu Z3MuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5jcHAKQEAgLTYy Nyw2ICs2MjcsMTcgQEAgUVN0cmluZyBRV2ViU2V0dGluZ3M6OmRlZmF1bHRUZXh0RW5jb2Rpbmco KSBjb25zdAogICAgIHJldHVybiBkLT5kZWZhdWx0VGV4dEVuY29kaW5nOwogfQogCit2b2lkIFFX ZWJTZXR0aW5nczo6ZW5hYmxlTG9hZGluZ0ltYWdlKGNvbnN0IFFTdHJpbmcgJmltYWdlKQorewor ICAgIGlmICghZC0+c2V0dGluZ3MpCisgICAgICAgIHJldHVybjsKKworICAgIGlmIChpbWFnZSA9 PSBRTGF0aW4xU3RyaW5nKCJqcGVnIikpCisgICAgICAgIGQtPnNldHRpbmdzLT5zZXRMb2Fkc1Np dGVKUEVHSW1hZ2VzSWdub3JpbmdJbWFnZUxvYWRpbmdTZXR0aW5nKHRydWUpOworICAgIGVsc2Ug aWYoaW1hZ2UgPT0gUUxhdGluMVN0cmluZygicG5nIikpCisgICAgICAgIGQtPnNldHRpbmdzLT5z ZXRMb2Fkc1NpdGVQTkdJbWFnZXNJZ25vcmluZ0ltYWdlTG9hZGluZ1NldHRpbmcodHJ1ZSk7Cit9 CisKIC8qIQogICAgIFNldHMgdGhlIHBhdGggb2YgdGhlIGljb24gZGF0YWJhc2UgdG8gXGEgcGF0 aC4gVGhlIGljb24gZGF0YWJhc2UgaXMgdXNlZAogICAgIHRvIHN0b3JlICJmYXZpY29ucyIgYXNz b2NpYXRlZCB3aXRoIHdlYiBzaXRlcy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvQXBp L3F3ZWJzZXR0aW5ncy5oIGIvU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmgKaW5k ZXggMDA4MDM1Yi4uZDVkMDk5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9BcGkvcXdl YnNldHRpbmdzLmgKKysrIGIvU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmgKQEAg LTExNiw2ICsxMTYsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXREZWZhdWx0VGV4dEVuY29kaW5n KGNvbnN0IFFTdHJpbmcgJmVuY29kaW5nKTsKICAgICBRU3RyaW5nIGRlZmF1bHRUZXh0RW5jb2Rp bmcoKSBjb25zdDsKIAorICAgIHZvaWQgZW5hYmxlTG9hZGluZ0ltYWdlKGNvbnN0IFFTdHJpbmcg JmltYWdlKTsKKwogICAgIHN0YXRpYyB2b2lkIHNldEljb25EYXRhYmFzZVBhdGgoY29uc3QgUVN0 cmluZyAmbG9jYXRpb24pOwogICAgIHN0YXRpYyBRU3RyaW5nIGljb25EYXRhYmFzZVBhdGgoKTsK ICAgICBzdGF0aWMgdm9pZCBjbGVhckljb25EYXRhYmFzZSgpOwotLSAKMS43LjEKCg==