392457 2018-03-28 15:50:01 +0000 Tellico 3.1.2 fails to compile with Qt 5.6.2 2018-03-28 16:53:20 +0000 1 1 2 Applications tellico general 3.1.2 openSUSE Linux RESOLVED FIXED https://build.opensuse.org/build/home:wolfi323:branches:home:wolfi323:branches:KDE:Extra/openSUSE_Leap_42.3/x86_64/tellico/_log NOR normal --- 1 wbauer1 robby bruno https://commits.kde.org/tellico/8e6c74d6f23ff06d615d1eb5e3fda2a786a1b3fc 3.1.3 0 oldest_to_newest 1741369 0 111704 wbauer1 2018-03-28 15:50:01 +0000 Created attachment 111704 Patch that fixed the compilation I got compiler errors like this when trying to build the new release on openSUSE Leap 42.3: /home/abuild/rpmbuild/BUILD/tellico-3.1.2/src/fetch/allocinefetcher.cpp:379:52: error: lambda-expression in unevaluated context foreach(const QVariant& variant, resultMap.value(QStringLiteral("genre")).toList()) { ^ The reason is the switch from QLatin1String() to QStringLiteral() in that foreach() statement, which apparently causes problems with Qt 5.6. I attached a patch that shows all affected places. It built fine (unmodified) with Qt 5.9 and 5.10, I haven't tried other Qt versions. 1741373 1 wbauer1 2018-03-28 16:05:27 +0000 (In reply to Wolfgang Bauer from comment #0) > It built fine (unmodified) with Qt 5.9 and 5.10, I haven't tried other Qt > versions. To avoid misunderstandings: the original (unpatched) tellico 3.1.2 sources built fine with Qt 5.9 and Qt 5.10, but not 5.6. The attached patch made it compile with Qt 5.6 too. 1741377 2 bruno 2018-03-28 16:16:17 +0000 I can confirm that you patch works fine as well on my mageia 6 distribution, which also has QT 5.6.2. Thanks as it will allow us to update tellico ;-) 1741387 3 robby 2018-03-28 16:53:20 +0000 Git commit 8e6c74d6f23ff06d615d1eb5e3fda2a786a1b3fc by Robby Stephenson. Committed on 28/03/2018 at 16:51. Pushed by rstephenson into branch '3.1'. Fix compilation with Qt 5.6 QStringLiteral doesn't work everywhere apparently for Qt 5.6. Revert some changes made by clazy. Thanks to the patch from Wolfgang Bauer. FIXED-IN: 3.1.3 M +4 -0 ChangeLog M +3 -3 src/fetch/allocinefetcher.cpp M +7 -7 src/fetch/discogsfetcher.cpp M +6 -6 src/fetch/doubanfetcher.cpp M +1 -1 src/fetch/filmasterfetcher.cpp M +1 -1 src/fetch/googlebookfetcher.cpp M +2 -2 src/fetch/igdbfetcher.cpp M +1 -1 src/fetch/imdbfetcher.cpp M +2 -2 src/fetch/isbndbfetcher.cpp M +1 -1 src/fetch/kinofetcher.cpp M +1 -1 src/fetch/moviemeterfetcher.cpp M +2 -2 src/fetch/openlibraryfetcher.cpp M +5 -5 src/fetch/themoviedbfetcher.cpp https://commits.kde.org/tellico/8e6c74d6f23ff06d615d1eb5e3fda2a786a1b3fc 111704 2018-03-28 15:50:01 +0000 2018-03-28 15:50:01 +0000 Patch that fixed the compilation fix-build-with-Qt5.6.patch text/plain 17526 wbauer1 ZGlmZiAtLWdpdCBhL3NyYy9mZXRjaC9hbGxvY2luZWZldGNoZXIuY3BwIGIvc3JjL2ZldGNoL2Fs bG9jaW5lZmV0Y2hlci5jcHAKaW5kZXggNTIyYzU1ODUuLjBhOTFmYjIxIDEwMDY0NAotLS0gYS9z cmMvZmV0Y2gvYWxsb2NpbmVmZXRjaGVyLmNwcAorKysgYi9zcmMvZmV0Y2gvYWxsb2NpbmVmZXRj aGVyLmNwcApAQCAtMzc2LDE5ICszNzYsMTkgQEAgdm9pZCBBYnN0cmFjdEFsbG9jaW5lRmV0Y2hl cjo6cG9wdWxhdGVFbnRyeShEYXRhOjpFbnRyeVB0ciBlbnRyeSwgY29uc3QgUVZhcmlhbnQKICAg ZW50cnktPnNldEZpZWxkKFFTdHJpbmdMaXRlcmFsKCJzdHVkaW8iKSwgbWFwVmFsdWUocmVsZWFz ZU1hcCwgImRpc3RyaWJ1dG9yIiwgIm5hbWUiKSk7CiAKICAgUVN0cmluZ0xpc3QgZ2VucmVzOwot ICBmb3JlYWNoKGNvbnN0IFFWYXJpYW50JiB2YXJpYW50LCByZXN1bHRNYXAudmFsdWUoUVN0cmlu Z0xpdGVyYWwoImdlbnJlIikpLnRvTGlzdCgpKSB7CisgIGZvcmVhY2goY29uc3QgUVZhcmlhbnQm IHZhcmlhbnQsIHJlc3VsdE1hcC52YWx1ZShRTGF0aW4xU3RyaW5nKCJnZW5yZSIpKS50b0xpc3Qo KSkgewogICAgIGdlbnJlcyA8PCBpMThuKG1hcFZhbHVlKHZhcmlhbnQudG9NYXAoKSwgIiQiKS50 b1V0ZjgoKS5jb25zdERhdGEoKSk7CiAgIH0KICAgZW50cnktPnNldEZpZWxkKFFTdHJpbmdMaXRl cmFsKCJnZW5yZSIpLCBnZW5yZXMuam9pbihGaWVsZEZvcm1hdDo6ZGVsaW1pdGVyU3RyaW5nKCkp KTsKIAogICBRU3RyaW5nTGlzdCBuYXRzOwotICBmb3JlYWNoKGNvbnN0IFFWYXJpYW50JiB2YXJp YW50LCByZXN1bHRNYXAudmFsdWUoUVN0cmluZ0xpdGVyYWwoIm5hdGlvbmFsaXR5IikpLnRvTGlz dCgpKSB7CisgIGZvcmVhY2goY29uc3QgUVZhcmlhbnQmIHZhcmlhbnQsIHJlc3VsdE1hcC52YWx1 ZShRTGF0aW4xU3RyaW5nKCJuYXRpb25hbGl0eSIpKS50b0xpc3QoKSkgewogICAgIG5hdHMgPDwg bWFwVmFsdWUodmFyaWFudC50b01hcCgpLCAiJCIpOwogICB9CiAgIGVudHJ5LT5zZXRGaWVsZChR U3RyaW5nTGl0ZXJhbCgibmF0aW9uYWxpdHkiKSwgbmF0cy5qb2luKEZpZWxkRm9ybWF0OjpkZWxp bWl0ZXJTdHJpbmcoKSkpOwogCiAgIFFTdHJpbmdMaXN0IGxhbmdzOwotICBmb3JlYWNoKGNvbnN0 IFFWYXJpYW50JiB2YXJpYW50LCByZXN1bHRNYXAudmFsdWUoUVN0cmluZ0xpdGVyYWwoImxhbmd1 YWdlIikpLnRvTGlzdCgpKSB7CisgIGZvcmVhY2goY29uc3QgUVZhcmlhbnQmIHZhcmlhbnQsIHJl c3VsdE1hcC52YWx1ZShRTGF0aW4xU3RyaW5nKCJsYW5ndWFnZSIpKS50b0xpc3QoKSkgewogICAg IGxhbmdzIDw8IG1hcFZhbHVlKHZhcmlhbnQudG9NYXAoKSwgIiQiKTsKICAgfQogICBlbnRyeS0+ c2V0RmllbGQoUVN0cmluZ0xpdGVyYWwoImxhbmd1YWdlIiksIGxhbmdzLmpvaW4oRmllbGRGb3Jt YXQ6OmRlbGltaXRlclN0cmluZygpKSk7CmRpZmYgLS1naXQgYS9zcmMvZmV0Y2gvZGlzY29nc2Zl dGNoZXIuY3BwIGIvc3JjL2ZldGNoL2Rpc2NvZ3NmZXRjaGVyLmNwcAppbmRleCAyZjdmNDQxNy4u N2Y2MzYwZjQgMTAwNjQ0Ci0tLSBhL3NyYy9mZXRjaC9kaXNjb2dzZmV0Y2hlci5jcHAKKysrIGIv c3JjL2ZldGNoL2Rpc2NvZ3NmZXRjaGVyLmNwcApAQCAtMjgwLDcgKzI4MCw3IEBAIHZvaWQgRGlz Y29nc0ZldGNoZXI6OnNsb3RDb21wbGV0ZShLSm9iKikgewogICB9CiAKICAgaW50IGNvdW50ID0g MDsKLSAgZm9yZWFjaChjb25zdCBRVmFyaWFudCYgcmVzdWx0LCByZXN1bHRNYXAudmFsdWUoUVN0 cmluZ0xpdGVyYWwoInJlc3VsdHMiKSkudG9MaXN0KCkpIHsKKyAgZm9yZWFjaChjb25zdCBRVmFy aWFudCYgcmVzdWx0LCByZXN1bHRNYXAudmFsdWUoUUxhdGluMVN0cmluZygicmVzdWx0cyIpKS50 b0xpc3QoKSkgewogICAgIGlmKGNvdW50ID49IERJU0NPR1NfTUFYX1JFVFVSTlNfVE9UQUwpIHsK ICAgICAgIGJyZWFrOwogICAgIH0KQEAgLTMwNiwxMyArMzA2LDEzIEBAIHZvaWQgRGlzY29nc0Zl dGNoZXI6OnBvcHVsYXRlRW50cnkoRGF0YTo6RW50cnlQdHIgZW50cnlfLCBjb25zdCBRVmFyaWFu dE1hcCYgcmVzCiAgIGVudHJ5Xy0+c2V0RmllbGQoUVN0cmluZ0xpdGVyYWwoImdlbnJlIiksICBt YXBWYWx1ZShyZXN1bHRNYXBfLCAiZ2VucmVzIikpOwogCiAgIFFTdHJpbmdMaXN0IGFydGlzdHM7 Ci0gIGZvcmVhY2goY29uc3QgUVZhcmlhbnQmIGFydGlzdCwgcmVzdWx0TWFwXy52YWx1ZShRU3Ry aW5nTGl0ZXJhbCgiYXJ0aXN0cyIpKS50b0xpc3QoKSkgeworICBmb3JlYWNoKGNvbnN0IFFWYXJp YW50JiBhcnRpc3QsIHJlc3VsdE1hcF8udmFsdWUoUUxhdGluMVN0cmluZygiYXJ0aXN0cyIpKS50 b0xpc3QoKSkgewogICAgIGFydGlzdHMgPDwgbWFwVmFsdWUoYXJ0aXN0LnRvTWFwKCksICJuYW1l Iik7CiAgIH0KICAgZW50cnlfLT5zZXRGaWVsZChRU3RyaW5nTGl0ZXJhbCgiYXJ0aXN0IiksIGFy dGlzdHMuam9pbihGaWVsZEZvcm1hdDo6ZGVsaW1pdGVyU3RyaW5nKCkpKTsKIAogICBRU3RyaW5n TGlzdCBsYWJlbHM7Ci0gIGZvcmVhY2goY29uc3QgUVZhcmlhbnQmIGxhYmVsLCByZXN1bHRNYXBf LnZhbHVlKFFTdHJpbmdMaXRlcmFsKCJsYWJlbHMiKSkudG9MaXN0KCkpIHsKKyAgZm9yZWFjaChj b25zdCBRVmFyaWFudCYgbGFiZWwsIHJlc3VsdE1hcF8udmFsdWUoUUxhdGluMVN0cmluZygibGFi ZWxzIikpLnRvTGlzdCgpKSB7CiAgICAgbGFiZWxzIDw8IG1hcFZhbHVlKGxhYmVsLnRvTWFwKCks ICJuYW1lIik7CiAgIH0KICAgZW50cnlfLT5zZXRGaWVsZChRU3RyaW5nTGl0ZXJhbCgibGFiZWwi KSwgbGFiZWxzLmpvaW4oRmllbGRGb3JtYXQ6OmRlbGltaXRlclN0cmluZygpKSk7CkBAIC0zMzEs NyArMzMxLDcgQEAgdm9pZCBEaXNjb2dzRmV0Y2hlcjo6cG9wdWxhdGVFbnRyeShEYXRhOjpFbnRy eVB0ciBlbnRyeV8sIGNvbnN0IFFWYXJpYW50TWFwJiByZXMKICAgLy8gY2hlY2sgdGhlIGZvcm1h dHMsIGl0IGNvdWxkIGhhdmUgbXVsdGlwbGUKICAgLy8gaWYgdGhlcmUgaXMgYSBDRCwgcHJlZmVy IHRoYXQgaW4gdGhlIHRyYWNrIGxpc3QKICAgYm9vbCBoYXNDRCA9IGZhbHNlOwotICBmb3JlYWNo KGNvbnN0IFFWYXJpYW50JiBmb3JtYXQsIHJlc3VsdE1hcF8udmFsdWUoUVN0cmluZ0xpdGVyYWwo ImZvcm1hdHMiKSkudG9MaXN0KCkpIHsKKyAgZm9yZWFjaChjb25zdCBRVmFyaWFudCYgZm9ybWF0 LCByZXN1bHRNYXBfLnZhbHVlKFFMYXRpbjFTdHJpbmcoImZvcm1hdHMiKSkudG9MaXN0KCkpIHsK ICAgICBpZihtYXBWYWx1ZShmb3JtYXQudG9NYXAoKSwgIm5hbWUiKSA9PSBRTGF0aW4xU3RyaW5n KCJDRCIpKSB7CiAgICAgICBlbnRyeV8tPnNldEZpZWxkKFFTdHJpbmdMaXRlcmFsKCJtZWRpdW0i KSwgaTE4bigiQ29tcGFjdCBEaXNjIikpOwogICAgICAgaGFzQ0QgPSB0cnVlOwpAQCAtMzQ2LDcg KzM0Niw3IEBAIHZvaWQgRGlzY29nc0ZldGNoZXI6OnBvcHVsYXRlRW50cnkoRGF0YTo6RW50cnlQ dHIgZW50cnlfLCBjb25zdCBRVmFyaWFudE1hcCYgcmVzCiAgIH0KIAogICBRU3RyaW5nTGlzdCB0 cmFja3M7Ci0gIGZvcmVhY2goY29uc3QgUVZhcmlhbnQmIHRyYWNrLCByZXN1bHRNYXBfLnZhbHVl KFFTdHJpbmdMaXRlcmFsKCJ0cmFja2xpc3QiKSkudG9MaXN0KCkpIHsKKyAgZm9yZWFjaChjb25z dCBRVmFyaWFudCYgdHJhY2ssIHJlc3VsdE1hcF8udmFsdWUoUUxhdGluMVN0cmluZygidHJhY2ts aXN0IikpLnRvTGlzdCgpKSB7CiAgICAgY29uc3QgUVZhcmlhbnRNYXAgdHJhY2tNYXAgPSB0cmFj ay50b01hcCgpOwogICAgIGlmKG1hcFZhbHVlKHRyYWNrTWFwLCAidHlwZV8iKSAhPSBRTGF0aW4x U3RyaW5nKCJ0cmFjayIpKSB7CiAgICAgICBjb250aW51ZTsKQEAgLTM2Myw3ICszNjMsNyBAQCB2 b2lkIERpc2NvZ3NGZXRjaGVyOjpwb3B1bGF0ZUVudHJ5KERhdGE6OkVudHJ5UHRyIGVudHJ5Xywg Y29uc3QgUVZhcmlhbnRNYXAmIHJlcwogICAgIHRyYWNrSW5mbyA8PCBtYXBWYWx1ZSh0cmFja01h cCwgInRpdGxlIik7CiAgICAgaWYodHJhY2tNYXAuY29udGFpbnMoUVN0cmluZ0xpdGVyYWwoImFy dGlzdHMiKSkpIHsKICAgICAgIFFTdHJpbmdMaXN0IGFydGlzdHM7Ci0gICAgICBmb3JlYWNoKGNv bnN0IFFWYXJpYW50JiBhcnRpc3QsIHRyYWNrTWFwLnZhbHVlKFFTdHJpbmdMaXRlcmFsKCJhcnRp c3RzIikpLnRvTGlzdCgpKSB7CisgICAgICBmb3JlYWNoKGNvbnN0IFFWYXJpYW50JiBhcnRpc3Qs IHRyYWNrTWFwLnZhbHVlKFFMYXRpbjFTdHJpbmcoImFydGlzdHMiKSkudG9MaXN0KCkpIHsKICAg ICAgICAgYXJ0aXN0cyA8PCBtYXBWYWx1ZShhcnRpc3QudG9NYXAoKSwgIm5hbWUiKTsKICAgICAg IH0KICAgICAgIHRyYWNrSW5mbyA8PCBhcnRpc3RzLmpvaW4oRmllbGRGb3JtYXQ6OmRlbGltaXRl clN0cmluZygpKTsKQEAgLTM4NSw3ICszODUsNyBAQCB2b2lkIERpc2NvZ3NGZXRjaGVyOjpwb3B1 bGF0ZUVudHJ5KERhdGE6OkVudHJ5UHRyIGVudHJ5XywgY29uc3QgUVZhcmlhbnRNYXAmIHJlcwog CiAgIGlmKGVudHJ5Xy0+Y29sbGVjdGlvbigpLT5oYXNGaWVsZChRU3RyaW5nTGl0ZXJhbCgicHJv ZHVjZXIiKSkpIHsKICAgICBRU3RyaW5nTGlzdCBwcm9kdWNlcnM7Ci0gICAgZm9yZWFjaChjb25z dCBRVmFyaWFudCYgZXh0cmFhcnRpc3QsIHJlc3VsdE1hcF8udmFsdWUoUVN0cmluZ0xpdGVyYWwo ImV4dHJhYXJ0aXN0cyIpKS50b0xpc3QoKSkgeworICAgIGZvcmVhY2goY29uc3QgUVZhcmlhbnQm IGV4dHJhYXJ0aXN0LCByZXN1bHRNYXBfLnZhbHVlKFFMYXRpbjFTdHJpbmcoImV4dHJhYXJ0aXN0 cyIpKS50b0xpc3QoKSkgewogICAgICAgaWYobWFwVmFsdWUoZXh0cmFhcnRpc3QudG9NYXAoKSwg InJvbGUiKS5jb250YWlucyhRTGF0aW4xU3RyaW5nKCJQcm9kdWNlciIpKSkgewogICAgICAgICBw cm9kdWNlcnMgPDwgbWFwVmFsdWUoZXh0cmFhcnRpc3QudG9NYXAoKSwgIm5hbWUiKTsKICAgICAg IH0KZGlmZiAtLWdpdCBhL3NyYy9mZXRjaC9kb3ViYW5mZXRjaGVyLmNwcCBiL3NyYy9mZXRjaC9k b3ViYW5mZXRjaGVyLmNwcAppbmRleCAxNDY4MzNiYi4uOWUwZTMzZTMgMTAwNjQ0Ci0tLSBhL3Ny Yy9mZXRjaC9kb3ViYW5mZXRjaGVyLmNwcAorKysgYi9zcmMvZmV0Y2gvZG91YmFuZmV0Y2hlci5j cHAKQEAgLTIyNyw3ICsyMjcsNyBAQCB2b2lkIERvdWJhbkZldGNoZXI6OnNsb3RDb21wbGV0ZShL Sm9iKiBqb2JfKSB7CiAgIHN3aXRjaChyZXF1ZXN0KCkuY29sbGVjdGlvblR5cGUpIHsKICAgICBj YXNlIERhdGE6OkNvbGxlY3Rpb246OkJvb2s6CiAgICAgY2FzZSBEYXRhOjpDb2xsZWN0aW9uOjpC aWJ0ZXg6Ci0gICAgICBmb3JlYWNoKGNvbnN0IFFWYXJpYW50JiB2LCByZXN1bHRzTWFwLnZhbHVl KFFTdHJpbmdMaXRlcmFsKCJib29rcyIpKS50b0xpc3QoKSkgeworICAgICAgZm9yZWFjaChjb25z dCBRVmFyaWFudCYgdiwgcmVzdWx0c01hcC52YWx1ZShRTGF0aW4xU3RyaW5nKCJib29rcyIpKS50 b0xpc3QoKSkgewogICAgICAgICBjb25zdCBRVmFyaWFudE1hcCByZXN1bHRNYXAgPSB2LnRvTWFw KCk7CiAgICAgICAgIEZldGNoUmVzdWx0KiByID0gbmV3IEZldGNoUmVzdWx0KEZldGNoZXI6OlB0 cih0aGlzKSwgbWFwVmFsdWUocmVzdWx0TWFwLCAidGl0bGUiKSwKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgbWFwVmFsdWUocmVzdWx0TWFwLCAiYXV0aG9yIikgKyBR TGF0aW4xQ2hhcignLycpICsKQEAgLTIzOSw3ICsyMzksNyBAQCB2b2lkIERvdWJhbkZldGNoZXI6 OnNsb3RDb21wbGV0ZShLSm9iKiBqb2JfKSB7CiAgICAgICBicmVhazsKIAogICAgIGNhc2UgRGF0 YTo6Q29sbGVjdGlvbjo6VmlkZW86Ci0gICAgICBmb3JlYWNoKGNvbnN0IFFWYXJpYW50JiB2LCBy ZXN1bHRzTWFwLnZhbHVlKFFTdHJpbmdMaXRlcmFsKCJzdWJqZWN0cyIpKS50b0xpc3QoKSkgewor ICAgICAgZm9yZWFjaChjb25zdCBRVmFyaWFudCYgdiwgcmVzdWx0c01hcC52YWx1ZShRTGF0aW4x U3RyaW5nKCJzdWJqZWN0cyIpKS50b0xpc3QoKSkgewogICAgICAgICBjb25zdCBRVmFyaWFudE1h cCByZXN1bHRNYXAgPSB2LnRvTWFwKCk7CiAgICAgICAgIEZldGNoUmVzdWx0KiByID0gbmV3IEZl dGNoUmVzdWx0KEZldGNoZXI6OlB0cih0aGlzKSwgbWFwVmFsdWUocmVzdWx0TWFwLCAidGl0bGUi KSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbWFwVmFsdWUocmVz dWx0TWFwLCAiZGlyZWN0b3JzIiwgIm5hbWUiKSArIFFMYXRpbjFDaGFyKCcvJykgKwpAQCAtMjUz LDcgKzI1Myw3IEBAIHZvaWQgRG91YmFuRmV0Y2hlcjo6c2xvdENvbXBsZXRlKEtKb2IqIGpvYl8p IHsKICAgICAgIGJyZWFrOwogCiAgICAgY2FzZSBEYXRhOjpDb2xsZWN0aW9uOjpBbGJ1bToKLSAg ICAgIGZvcmVhY2goY29uc3QgUVZhcmlhbnQmIHYsIHJlc3VsdHNNYXAudmFsdWUoUVN0cmluZ0xp dGVyYWwoIm11c2ljcyIpKS50b0xpc3QoKSkgeworICAgICAgZm9yZWFjaChjb25zdCBRVmFyaWFu dCYgdiwgcmVzdWx0c01hcC52YWx1ZShRTGF0aW4xU3RyaW5nKCJtdXNpY3MiKSkudG9MaXN0KCkp IHsKICAgICAgICAgY29uc3QgUVZhcmlhbnRNYXAgcmVzdWx0TWFwID0gdi50b01hcCgpOwogICAg ICAgICBGZXRjaFJlc3VsdCogciA9IG5ldyBGZXRjaFJlc3VsdChGZXRjaGVyOjpQdHIodGhpcyks IG1hcFZhbHVlKHJlc3VsdE1hcCwgInRpdGxlIiksCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIG1hcFZhbHVlKHJlc3VsdE1hcCwgImF0dHJzIiwgInNpbmdlciIpICsg UUxhdGluMUNoYXIoJy8nKSArCkBAIC00MTEsNyArNDExLDcgQEAgdm9pZCBEb3ViYW5GZXRjaGVy Ojpwb3B1bGF0ZVZpZGVvRW50cnkoRGF0YTo6RW50cnlQdHIgZW50cnksIGNvbnN0IFFWYXJpYW50 TWFwJgogICBlbnRyeS0+c2V0RmllbGQoUVN0cmluZ0xpdGVyYWwoInBsb3QiKSwgbWFwVmFsdWUo cmVzdWx0TWFwXywgInN1bW1hcnkiKSk7CiAKICAgUVN0cmluZ0xpc3QgYWN0b3JzOwotICBmb3Jl YWNoKGNvbnN0IFFWYXJpYW50JiB2LCByZXN1bHRNYXBfLnZhbHVlKFFTdHJpbmdMaXRlcmFsKCJj YXN0cyIpKS50b0xpc3QoKSkgeworICBmb3JlYWNoKGNvbnN0IFFWYXJpYW50JiB2LCByZXN1bHRN YXBfLnZhbHVlKFFMYXRpbjFTdHJpbmcoImNhc3RzIikpLnRvTGlzdCgpKSB7CiAgICAgYWN0b3Jz IDw8IHYudG9NYXAoKS52YWx1ZShRU3RyaW5nTGl0ZXJhbCgibmFtZSIpKS50b1N0cmluZygpOwog ICB9CiAgIGVudHJ5LT5zZXRGaWVsZChRU3RyaW5nTGl0ZXJhbCgiY2FzdCIpLCBhY3RvcnMuam9p bihGaWVsZEZvcm1hdDo6cm93RGVsaW1pdGVyU3RyaW5nKCkpKTsKQEAgLTQzOCw4ICs0MzgsOCBA QCB2b2lkIERvdWJhbkZldGNoZXI6OnBvcHVsYXRlTXVzaWNFbnRyeShEYXRhOjpFbnRyeVB0ciBl bnRyeSwgY29uc3QgUVZhcmlhbnRNYXAmCiAgIH0KIAogICBRU3RyaW5nTGlzdCB2YWx1ZXMsIHRy YWNrczsKLSAgZm9yZWFjaChjb25zdCBRVmFyaWFudCYgdiwgcmVzdWx0TWFwXy52YWx1ZShRU3Ry aW5nTGl0ZXJhbCgiYXR0cnMiKSkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAudG9N YXAoKS52YWx1ZShRU3RyaW5nTGl0ZXJhbCgidHJhY2tzIikpLnRvTGlzdCgpKSB7CisgIGZvcmVh Y2goY29uc3QgUVZhcmlhbnQmIHYsIHJlc3VsdE1hcF8udmFsdWUoUUxhdGluMVN0cmluZygiYXR0 cnMiKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAudG9NYXAoKS52YWx1ZShRTGF0 aW4xU3RyaW5nKCJ0cmFja3MiKSkudG9MaXN0KCkpIHsKICAgICAvLyBzb21lIGNhc2VzIGhhdmUg YWxsIHRoZSB0cmFja3MgaW4gb25lIGl0ZW0sIHNlcGFyYXRlZCBieSAiXG4iIGFuZCB1c2luZyAw MS4gdHJhY2sgbnVtYmVycwogICAgIGlmKHYudG9TdHJpbmcoKS5jb250YWlucyhRTGF0aW4xQ2hh cignXG4nKSkpIHsKICAgICAgIHZhbHVlcyA8PCB2LnRvU3RyaW5nKCkuc3BsaXQoUVN0cmluZ0xp dGVyYWwoIlxuIikpOwpkaWZmIC0tZ2l0IGEvc3JjL2ZldGNoL2ZpbG1hc3RlcmZldGNoZXIuY3Bw IGIvc3JjL2ZldGNoL2ZpbG1hc3RlcmZldGNoZXIuY3BwCmluZGV4IDZjYjRiZDk3Li5kZjBiZTBm YyAxMDA2NDQKLS0tIGEvc3JjL2ZldGNoL2ZpbG1hc3RlcmZldGNoZXIuY3BwCisrKyBiL3NyYy9m ZXRjaC9maWxtYXN0ZXJmZXRjaGVyLmNwcApAQCAtMjYwLDcgKzI2MCw3IEBAIHZvaWQgRmlsbWFz dGVyRmV0Y2hlcjo6cG9wdWxhdGVFbnRyeShEYXRhOjpFbnRyeVB0ciBlbnRyeV8sIGNvbnN0IFFW YXJpYW50TWFwJiByCiAgIGVudHJ5Xy0+c2V0RmllbGQoUVN0cmluZ0xpdGVyYWwoInBsb3QiKSwg bWFwVmFsdWUocmVzdWx0XywgImRlc2NyaXB0aW9uIikpOwogCiAgIFFTdHJpbmdMaXN0IGRpcmVj dG9yczsKLSAgZm9yZWFjaChjb25zdCBRVmFyaWFudCYgZGlyZWN0b3IsIHJlc3VsdF8udmFsdWUo UVN0cmluZ0xpdGVyYWwoImRpcmVjdG9ycyIpKS50b0xpc3QoKSkgeworICBmb3JlYWNoKGNvbnN0 IFFWYXJpYW50JiBkaXJlY3RvciwgcmVzdWx0Xy52YWx1ZShRTGF0aW4xU3RyaW5nKCJkaXJlY3Rv cnMiKSkudG9MaXN0KCkpIHsKICAgICBjb25zdCBRVmFyaWFudE1hcCBkaXJlY3Rvck1hcCA9IGRp cmVjdG9yLnRvTWFwKCk7CiAgICAgZGlyZWN0b3JzIDw8IG1hcFZhbHVlKGRpcmVjdG9yTWFwLCAi bmFtZSIpICsgUUxhdGluMUNoYXIoJyAnKSArIG1hcFZhbHVlKGRpcmVjdG9yTWFwLCAic3VybmFt ZSIpOwogICB9CmRpZmYgLS1naXQgYS9zcmMvZmV0Y2gvZ29vZ2xlYm9va2ZldGNoZXIuY3BwIGIv c3JjL2ZldGNoL2dvb2dsZWJvb2tmZXRjaGVyLmNwcAppbmRleCBkN2U4NWEwYi4uNzQ5Y2YyMDIg MTAwNjQ0Ci0tLSBhL3NyYy9mZXRjaC9nb29nbGVib29rZmV0Y2hlci5jcHAKKysrIGIvc3JjL2Zl dGNoL2dvb2dsZWJvb2tmZXRjaGVyLmNwcApAQCAtMzIwLDcgKzMyMCw3IEBAIHZvaWQgR29vZ2xl Qm9va0ZldGNoZXI6OnBvcHVsYXRlRW50cnkoRGF0YTo6RW50cnlQdHIgZW50cnksIGNvbnN0IFFW YXJpYW50TWFwJiByCiAgIGVudHJ5LT5zZXRGaWVsZChRU3RyaW5nTGl0ZXJhbCgia2V5d29yZCIp LCBjYXRMaXN0LmpvaW4oRmllbGRGb3JtYXQ6OmRlbGltaXRlclN0cmluZygpKSk7CiAKICAgUVN0 cmluZyBpc2JuOwotICBmb3JlYWNoKGNvbnN0IFFWYXJpYW50JiBpZFZhcmlhbnQsIHZvbHVtZU1h cC52YWx1ZShRU3RyaW5nTGl0ZXJhbCgiaW5kdXN0cnlJZGVudGlmaWVycyIpKS50b0xpc3QoKSkg eworICBmb3JlYWNoKGNvbnN0IFFWYXJpYW50JiBpZFZhcmlhbnQsIHZvbHVtZU1hcC52YWx1ZShR TGF0aW4xU3RyaW5nKCJpbmR1c3RyeUlkZW50aWZpZXJzIikpLnRvTGlzdCgpKSB7CiAgICAgY29u c3QgUVZhcmlhbnRNYXAgaWRNYXAgPSBpZFZhcmlhbnQudG9NYXAoKTsKICAgICBpZihtYXBWYWx1 ZShpZE1hcCwgInR5cGUiKSA9PSBRTGF0aW4xU3RyaW5nKCJJU0JOXzEwIikpIHsKICAgICAgIGlz Ym4gPSBtYXBWYWx1ZShpZE1hcCwgImlkZW50aWZpZXIiKTsKZGlmZiAtLWdpdCBhL3NyYy9mZXRj aC9pZ2RiZmV0Y2hlci5jcHAgYi9zcmMvZmV0Y2gvaWdkYmZldGNoZXIuY3BwCmluZGV4IGVhYWM4 MjIxLi5hNmE2MmU5NCAxMDA2NDQKLS0tIGEvc3JjL2ZldGNoL2lnZGJmZXRjaGVyLmNwcAorKysg Yi9zcmMvZmV0Y2gvaWdkYmZldGNoZXIuY3BwCkBAIC0xNTEsNyArMTUxLDcgQEAgVGVsbGljbzo6 RGF0YTo6RW50cnlQdHIgSUdEQkZldGNoZXI6OmZldGNoRW50cnlIb29rKHVpbnQgdWlkXykgewog ICBRU3RyaW5nTGlzdCBwdWJsaXNoZXJzOwogICAvLyBncmFiIHRoZSBwdWJsaXNoZXIgZGF0YQog ICBpZihlbnRyeS0+ZmllbGQoUVN0cmluZ0xpdGVyYWwoInB1Ymxpc2hlciIpKS5pc0VtcHR5KCkp IHsKLSAgICBmb3JlYWNoKGNvbnN0IFFTdHJpbmcmIHBpZCwgRmllbGRGb3JtYXQ6OnNwbGl0VmFs dWUoZW50cnktPmZpZWxkKFFTdHJpbmdMaXRlcmFsKCJwdWItaWQiKSkpKSB7CisgICAgZm9yZWFj aChjb25zdCBRU3RyaW5nJiBwaWQsIEZpZWxkRm9ybWF0OjpzcGxpdFZhbHVlKGVudHJ5LT5maWVs ZChRTGF0aW4xU3RyaW5nKCJwdWItaWQiKSkpKSB7CiAgICAgICBjb25zdCBRU3RyaW5nIHB1Ymxp c2hlciA9IGNvbXBhbnlOYW1lKHBpZCk7CiAgICAgICBpZighcHVibGlzaGVyLmlzRW1wdHkoKSkg ewogICAgICAgICBwdWJsaXNoZXJzIDw8IHB1Ymxpc2hlcjsKQEAgLTE2Myw3ICsxNjMsNyBAQCBU ZWxsaWNvOjpEYXRhOjpFbnRyeVB0ciBJR0RCRmV0Y2hlcjo6ZmV0Y2hFbnRyeUhvb2sodWludCB1 aWRfKSB7CiAgIFFTdHJpbmdMaXN0IGRldmVsb3BlcnM7CiAgIC8vIGdyYWIgdGhlIGRldmVsb3Bl ciBkYXRhCiAgIGlmKGVudHJ5LT5maWVsZChRU3RyaW5nTGl0ZXJhbCgiZGV2ZWxvcGVyIikpLmlz RW1wdHkoKSkgewotICAgIGZvcmVhY2goY29uc3QgUVN0cmluZyYgZGlkLCBGaWVsZEZvcm1hdDo6 c3BsaXRWYWx1ZShlbnRyeS0+ZmllbGQoUVN0cmluZ0xpdGVyYWwoImRldi1pZCIpKSkpIHsKKyAg ICBmb3JlYWNoKGNvbnN0IFFTdHJpbmcmIGRpZCwgRmllbGRGb3JtYXQ6OnNwbGl0VmFsdWUoZW50 cnktPmZpZWxkKFFMYXRpbjFTdHJpbmcoImRldi1pZCIpKSkpIHsKICAgICAgIGNvbnN0IFFTdHJp bmcgZGV2ZWxvcGVyID0gY29tcGFueU5hbWUoZGlkKTsKICAgICAgIGlmKCFkZXZlbG9wZXIuaXNF bXB0eSgpKSB7CiAgICAgICAgIGRldmVsb3BlcnMgPDwgZGV2ZWxvcGVyOwpkaWZmIC0tZ2l0IGEv c3JjL2ZldGNoL2ltZGJmZXRjaGVyLmNwcCBiL3NyYy9mZXRjaC9pbWRiZmV0Y2hlci5jcHAKaW5k ZXggMzE2NjJlMWEuLmMwMzNlNDExIDEwMDY0NAotLS0gYS9zcmMvZmV0Y2gvaW1kYmZldGNoZXIu Y3BwCisrKyBiL3NyYy9mZXRjaC9pbWRiZmV0Y2hlci5jcHAKQEAgLTEyMDMsNyArMTIwMyw3IEBA IHZvaWQgSU1EQkZldGNoZXI6OmRvTGlzdHMyKGNvbnN0IFFTdHJpbmcmIHN0cl8sIFRlbGxpY286 OkRhdGE6OkVudHJ5UHRyIGVudHJ5XykKICAgICAgICAgZ2VucmVzIDw8IHRva2VuLnRyaW1tZWQo KTsKICAgICAgIH0KICAgICB9IGVsc2UgaWYodGFnID09IGRhdGEubGFuZ3VhZ2UpIHsKLSAgICAg IGZvcmVhY2goY29uc3QgUVN0cmluZyYgdG9rZW4sIHZhbHVlLnNwbGl0KFFSZWdFeHAoUVN0cmlu Z0xpdGVyYWwoIlssfF0iKSkpKSB7CisgICAgICBmb3JlYWNoKGNvbnN0IFFTdHJpbmcmIHRva2Vu LCB2YWx1ZS5zcGxpdChRUmVnRXhwKFFMYXRpbjFTdHJpbmcoIlssfF0iKSkpKSB7CiAgICAgICAg IGxhbmdzIDw8IHRva2VuLnRyaW1tZWQoKTsKICAgICAgIH0KICAgICB9IGVsc2UgaWYodGFnID09 IGRhdGEuc291bmQpIHsKZGlmZiAtLWdpdCBhL3NyYy9mZXRjaC9pc2JuZGJmZXRjaGVyLmNwcCBi L3NyYy9mZXRjaC9pc2JuZGJmZXRjaGVyLmNwcAppbmRleCBhZWFmMTIzZi4uOWFmZDQwODQgMTAw NjQ0Ci0tLSBhL3NyYy9mZXRjaC9pc2JuZGJmZXRjaGVyLmNwcAorKysgYi9zcmMvZmV0Y2gvaXNi bmRiZmV0Y2hlci5jcHAKQEAgLTI1OSw3ICsyNTksNyBAQCB2b2lkIElTQk5kYkZldGNoZXI6OnBv cHVsYXRlRW50cnkoRGF0YTo6RW50cnlQdHIgZW50cnlfLCBjb25zdCBRVmFyaWFudE1hcCYgcmVz dQogICBRU3RyaW5nIHB1YlllYXIgPSBtYXBWYWx1ZShyZXN1bHRNYXBfLCAiZGF0ZV9wdWJsaXNo ZWQiKS5yZW1vdmUoUVJlZ0V4cChRU3RyaW5nTGl0ZXJhbCgiW15cXGRdIikpKS5sZWZ0KDQpOwog ICBlbnRyeV8tPnNldEZpZWxkKFFTdHJpbmdMaXRlcmFsKCJwdWJfeWVhciIpLCBwdWJZZWFyKTsK ICAgUVN0cmluZ0xpc3QgYXV0aG9yczsKLSAgZm9yZWFjaChjb25zdCBRVmFyaWFudCYgYXV0aG9y LCByZXN1bHRNYXBfLnZhbHVlKFFTdHJpbmdMaXRlcmFsKCJhdXRob3JzIikpLnRvTGlzdCgpKSB7 CisgIGZvcmVhY2goY29uc3QgUVZhcmlhbnQmIGF1dGhvciwgcmVzdWx0TWFwXy52YWx1ZShRTGF0 aW4xU3RyaW5nKCJhdXRob3JzIikpLnRvTGlzdCgpKSB7CiAgICAgYXV0aG9ycyArPSBhdXRob3Iu dG9TdHJpbmcoKTsKICAgfQogICBlbnRyeV8tPnNldEZpZWxkKFFTdHJpbmdMaXRlcmFsKCJhdXRo b3IiKSwgYXV0aG9ycy5qb2luKEZpZWxkRm9ybWF0OjpkZWxpbWl0ZXJTdHJpbmcoKSkpOwpAQCAt Mjc4LDcgKzI3OCw3IEBAIHZvaWQgSVNCTmRiRmV0Y2hlcjo6cG9wdWxhdGVFbnRyeShEYXRhOjpF bnRyeVB0ciBlbnRyeV8sIGNvbnN0IFFWYXJpYW50TWFwJiByZXN1CiAgICAgZW50cnlfLT5zZXRG aWVsZChRU3RyaW5nTGl0ZXJhbCgiYmluZGluZyIpLCBpMThuKGJpbmRpbmcudG9VdGY4KCkuY29u c3REYXRhKCkpKTsKICAgfQogICBRU3RyaW5nTGlzdCBzdWJqZWN0czsKLSAgZm9yZWFjaChjb25z dCBRVmFyaWFudCYgc3ViamVjdCwgcmVzdWx0TWFwXy52YWx1ZShRU3RyaW5nTGl0ZXJhbCgic3Vi amVjdHMiKSkudG9MaXN0KCkpIHsKKyAgZm9yZWFjaChjb25zdCBRVmFyaWFudCYgc3ViamVjdCwg cmVzdWx0TWFwXy52YWx1ZShRTGF0aW4xU3RyaW5nKCJzdWJqZWN0cyIpKS50b0xpc3QoKSkgewog ICAgIHN1YmplY3RzICs9IHN1YmplY3QudG9TdHJpbmcoKTsKICAgfQogICBlbnRyeV8tPnNldEZp ZWxkKFFTdHJpbmdMaXRlcmFsKCJnZW5yZSIpLCBzdWJqZWN0cy5qb2luKEZpZWxkRm9ybWF0Ojpk ZWxpbWl0ZXJTdHJpbmcoKSkpOwpkaWZmIC0tZ2l0IGEvc3JjL2ZldGNoL2tpbm9mZXRjaGVyLmNw cCBiL3NyYy9mZXRjaC9raW5vZmV0Y2hlci5jcHAKaW5kZXggODAxYWU3ZWUuLmE4MmU1MTZkIDEw MDY0NAotLS0gYS9zcmMvZmV0Y2gva2lub2ZldGNoZXIuY3BwCisrKyBiL3NyYy9mZXRjaC9raW5v ZmV0Y2hlci5jcHAKQEAgLTIzMCw3ICsyMzAsNyBAQCB2b2lkIEtpbm9GZXRjaGVyOjpwYXJzZUVu dHJ5KERhdGE6OkVudHJ5UHRyIGVudHJ5LCBjb25zdCBRU3RyaW5nJiBzdHJfKSB7CiAgICAgZW50 cnktPnNldEZpZWxkKFFTdHJpbmdMaXRlcmFsKCJkaXJlY3RvciIpLCBtYXBWYWx1ZShvYmplY3RN YXAsICJkaXJlY3RvciIsICJuYW1lIikpOwogCiAgICAgUVN0cmluZ0xpc3QgYWN0b3JzOwotICAg IGZvcmVhY2goUVZhcmlhbnQgdiwgb2JqZWN0TWFwLnZhbHVlKFFTdHJpbmdMaXRlcmFsKCJhY3Rv ciIpKS50b0xpc3QoKSkgeworICAgIGZvcmVhY2goUVZhcmlhbnQgdiwgb2JqZWN0TWFwLnZhbHVl KFFMYXRpbjFTdHJpbmcoImFjdG9yIikpLnRvTGlzdCgpKSB7CiAgICAgICBjb25zdCBRU3RyaW5n IGFjdG9yID0gbWFwVmFsdWUodi50b01hcCgpLCAibmFtZSIpOwogICAgICAgaWYoIWFjdG9yLmlz RW1wdHkoKSkgYWN0b3JzICs9IGFjdG9yOwogICAgIH0KZGlmZiAtLWdpdCBhL3NyYy9mZXRjaC9t b3ZpZW1ldGVyZmV0Y2hlci5jcHAgYi9zcmMvZmV0Y2gvbW92aWVtZXRlcmZldGNoZXIuY3BwCmlu ZGV4IGE2NzgwNDA2Li5kMTMyMDkxMCAxMDA2NDQKLS0tIGEvc3JjL2ZldGNoL21vdmllbWV0ZXJm ZXRjaGVyLmNwcAorKysgYi9zcmMvZmV0Y2gvbW92aWVtZXRlcmZldGNoZXIuY3BwCkBAIC0yNjAs NyArMjYwLDcgQEAgdm9pZCBNb3ZpZU1ldGVyRmV0Y2hlcjo6cG9wdWxhdGVFbnRyeShEYXRhOjpF bnRyeVB0ciBlbnRyeV8sIGNvbnN0IFFWYXJpYW50TWFwJgogICBlbnRyeV8tPnNldEZpZWxkKFFT dHJpbmdMaXRlcmFsKCJuYXRpb25hbGl0eSIpLCAgbWFwVmFsdWUocmVzdWx0TWFwXywgImNvdW50 cmllcyIpKTsKIAogICBRU3RyaW5nTGlzdCBjYXN0TGlzdDsKLSAgZm9yZWFjaChjb25zdCBRVmFy aWFudCYgYWN0b3IsIHJlc3VsdE1hcF8udmFsdWUoUVN0cmluZ0xpdGVyYWwoImFjdG9ycyIpKS50 b0xpc3QoKSkgeworICBmb3JlYWNoKGNvbnN0IFFWYXJpYW50JiBhY3RvciwgcmVzdWx0TWFwXy52 YWx1ZShRTGF0aW4xU3RyaW5nKCJhY3RvcnMiKSkudG9MaXN0KCkpIHsKICAgICBjYXN0TGlzdCA8 PCBtYXBWYWx1ZShhY3Rvci50b01hcCgpLCAibmFtZSIpOwogICB9CiAgIGVudHJ5Xy0+c2V0Rmll bGQoUVN0cmluZ0xpdGVyYWwoImNhc3QiKSwgY2FzdExpc3Quam9pbihGaWVsZEZvcm1hdDo6cm93 RGVsaW1pdGVyU3RyaW5nKCkpKTsKZGlmZiAtLWdpdCBhL3NyYy9mZXRjaC9vcGVubGlicmFyeWZl dGNoZXIuY3BwIGIvc3JjL2ZldGNoL29wZW5saWJyYXJ5ZmV0Y2hlci5jcHAKaW5kZXggZGQ5NGNj MDIuLjZhOGEyOTA3IDEwMDY0NAotLS0gYS9zcmMvZmV0Y2gvb3BlbmxpYnJhcnlmZXRjaGVyLmNw cAorKysgYi9zcmMvZmV0Y2gvb3BlbmxpYnJhcnlmZXRjaGVyLmNwcApAQCAtMjk4LDcgKzI5OCw3 IEBAIHZvaWQgT3BlbkxpYnJhcnlGZXRjaGVyOjpzbG90Q29tcGxldGUoS0pvYiogam9iXykgewog ICAgIH0KIAogICAgIFFTdHJpbmdMaXN0IGF1dGhvcnM7Ci0gICAgZm9yZWFjaChjb25zdCBRVmFy aWFudCYgYXV0aG9yTWFwLCByZXN1bHRNYXAudmFsdWUoUVN0cmluZ0xpdGVyYWwoImF1dGhvcnMi KSkudG9MaXN0KCkpIHsKKyAgICBmb3JlYWNoKGNvbnN0IFFWYXJpYW50JiBhdXRob3JNYXAsIHJl c3VsdE1hcC52YWx1ZShRTGF0aW4xU3RyaW5nKCJhdXRob3JzIikpLnRvTGlzdCgpKSB7CiAgICAg ICBjb25zdCBRU3RyaW5nIGtleSA9IG1hcFZhbHVlKGF1dGhvck1hcC50b01hcCgpLCAia2V5Iik7 CiAgICAgICBpZigha2V5LmlzRW1wdHkoKSkgewogICAgICAgICBRVXJsIGF1dGhvclVybChRU3Ry aW5nOjpmcm9tTGF0aW4xKE9QRU5MSUJSQVJZX1FVRVJZX1VSTCkpOwpAQCAtMzIzLDcgKzMyMyw3 IEBAIHZvaWQgT3BlbkxpYnJhcnlGZXRjaGVyOjpzbG90Q29tcGxldGUoS0pvYiogam9iXykgewog ICAgIH0KIAogICAgIFFTdHJpbmdMaXN0IGxhbmdzOwotICAgIGZvcmVhY2goY29uc3QgUVZhcmlh bnQmIGxhbmdNYXAsIHJlc3VsdE1hcC52YWx1ZShRU3RyaW5nTGl0ZXJhbCgibGFuZ3VhZ2VzIikp LnRvTGlzdCgpKSB7CisgICAgZm9yZWFjaChjb25zdCBRVmFyaWFudCYgbGFuZ01hcCwgcmVzdWx0 TWFwLnZhbHVlKFFMYXRpbjFTdHJpbmcoImxhbmd1YWdlcyIpKS50b0xpc3QoKSkgewogICAgICAg Y29uc3QgUVN0cmluZyBrZXkgPSBtYXBWYWx1ZShsYW5nTWFwLnRvTWFwKCksICJrZXkiKTsKICAg ICAgIGlmKCFrZXkuaXNFbXB0eSgpKSB7CiAgICAgICAgIFFVcmwgbGFuZ1VybChRU3RyaW5nOjpm cm9tTGF0aW4xKE9QRU5MSUJSQVJZX1FVRVJZX1VSTCkpOwpkaWZmIC0tZ2l0IGEvc3JjL2ZldGNo L3RoZW1vdmllZGJmZXRjaGVyLmNwcCBiL3NyYy9mZXRjaC90aGVtb3ZpZWRiZmV0Y2hlci5jcHAK aW5kZXggYzhhNjc2YjguLjIzNmIzODUzIDEwMDY0NAotLS0gYS9zcmMvZmV0Y2gvdGhlbW92aWVk YmZldGNoZXIuY3BwCisrKyBiL3NyYy9mZXRjaC90aGVtb3ZpZWRiZmV0Y2hlci5jcHAKQEAgLTM1 NSw4ICszNTUsOCBAQCB2b2lkIFRoZU1vdmllREJGZXRjaGVyOjpwb3B1bGF0ZUVudHJ5KERhdGE6 OkVudHJ5UHRyIGVudHJ5XywgY29uc3QgUVZhcmlhbnRNYXAmCiAgIH0KICAgaWYoZW50cnlfLT5j b2xsZWN0aW9uKCktPmhhc0ZpZWxkKFFTdHJpbmdMaXRlcmFsKCJhbHR0aXRsZSIpKSkgewogICAg IFFTdHJpbmdMaXN0IGF0aXRsZXM7Ci0gICAgZm9yZWFjaChjb25zdCBRVmFyaWFudCYgYXRpdGxl LCByZXN1bHRNYXBfLnZhbHVlKFFTdHJpbmdMaXRlcmFsKCJhbHRlcm5hdGl2ZV90aXRsZXMiKSku dG9NYXAoKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAu dmFsdWUoUVN0cmluZ0xpdGVyYWwoInRpdGxlcyIpKS50b0xpc3QoKSkgeworICAgIGZvcmVhY2go Y29uc3QgUVZhcmlhbnQmIGF0aXRsZSwgcmVzdWx0TWFwXy52YWx1ZShRTGF0aW4xU3RyaW5nKCJh bHRlcm5hdGl2ZV90aXRsZXMiKSkudG9NYXAoKQorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAudmFsdWUoUUxhdGluMVN0cmluZygidGl0bGVzIikpLnRvTGlz dCgpKSB7CiAgICAgICBhdGl0bGVzIDw8IG1hcFZhbHVlKGF0aXRsZS50b01hcCgpLCAidGl0bGUi KTsKICAgICB9CiAgICAgZW50cnlfLT5zZXRGaWVsZChRU3RyaW5nTGl0ZXJhbCgiYWx0dGl0bGUi KSwgYXRpdGxlcy5qb2luKEZpZWxkRm9ybWF0Ojpyb3dEZWxpbWl0ZXJTdHJpbmcoKSkpOwpAQCAt MzcyLDEzICszNzIsMTMgQEAgdm9pZCBUaGVNb3ZpZURCRmV0Y2hlcjo6cG9wdWxhdGVFbnRyeShE YXRhOjpFbnRyeVB0ciBlbnRyeV8sIGNvbnN0IFFWYXJpYW50TWFwJgogICBlbnRyeV8tPnNldEZp ZWxkKFFTdHJpbmdMaXRlcmFsKCJjYXN0IiksIGFjdG9ycy5qb2luKEZpZWxkRm9ybWF0Ojpyb3dE ZWxpbWl0ZXJTdHJpbmcoKSkpOwogCiAgIFFTdHJpbmdMaXN0IHN0dWRpb3M7Ci0gIGZvcmVhY2go Y29uc3QgUVZhcmlhbnQmIHN0dWRpbywgcmVzdWx0TWFwXy52YWx1ZShRU3RyaW5nTGl0ZXJhbCgi cHJvZHVjdGlvbl9jb21wYW5pZXMiKSkudG9MaXN0KCkpIHsKKyAgZm9yZWFjaChjb25zdCBRVmFy aWFudCYgc3R1ZGlvLCByZXN1bHRNYXBfLnZhbHVlKFFMYXRpbjFTdHJpbmcoInByb2R1Y3Rpb25f Y29tcGFuaWVzIikpLnRvTGlzdCgpKSB7CiAgICAgc3R1ZGlvcyA8PCBtYXBWYWx1ZShzdHVkaW8u dG9NYXAoKSwgIm5hbWUiKTsKICAgfQogICBlbnRyeV8tPnNldEZpZWxkKFFTdHJpbmdMaXRlcmFs KCJzdHVkaW8iKSwgc3R1ZGlvcy5qb2luKEZpZWxkRm9ybWF0OjpkZWxpbWl0ZXJTdHJpbmcoKSkp OwogCiAgIFFTdHJpbmdMaXN0IGNvdW50cmllczsKLSAgZm9yZWFjaChjb25zdCBRVmFyaWFudCYg Y291bnRyeSwgcmVzdWx0TWFwXy52YWx1ZShRU3RyaW5nTGl0ZXJhbCgicHJvZHVjdGlvbl9jb3Vu dHJpZXMiKSkudG9MaXN0KCkpIHsKKyAgZm9yZWFjaChjb25zdCBRVmFyaWFudCYgY291bnRyeSwg cmVzdWx0TWFwXy52YWx1ZShRTGF0aW4xU3RyaW5nKCJwcm9kdWN0aW9uX2NvdW50cmllcyIpKS50 b0xpc3QoKSkgewogICAgIFFTdHJpbmcgbmFtZSA9IG1hcFZhbHVlKGNvdW50cnkudG9NYXAoKSwg Im5hbWUiKTsKICAgICBpZihuYW1lID09IFFMYXRpbjFTdHJpbmcoIlVuaXRlZCBTdGF0ZXMgb2Yg QW1lcmljYSIpKSB7CiAgICAgICBuYW1lID0gUVN0cmluZ0xpdGVyYWwoIlVTQSIpOwpAQCAtMzg4 LDcgKzM4OCw3IEBAIHZvaWQgVGhlTW92aWVEQkZldGNoZXI6OnBvcHVsYXRlRW50cnkoRGF0YTo6 RW50cnlQdHIgZW50cnlfLCBjb25zdCBRVmFyaWFudE1hcCYKICAgZW50cnlfLT5zZXRGaWVsZChR U3RyaW5nTGl0ZXJhbCgibmF0aW9uYWxpdHkiKSwgY291bnRyaWVzLmpvaW4oRmllbGRGb3JtYXQ6 OmRlbGltaXRlclN0cmluZygpKSk7CiAKICAgUVN0cmluZ0xpc3QgZ2VucmVzOwotICBmb3JlYWNo KGNvbnN0IFFWYXJpYW50JiBnZW5yZSwgcmVzdWx0TWFwXy52YWx1ZShRU3RyaW5nTGl0ZXJhbCgi Z2VucmVzIikpLnRvTGlzdCgpKSB7CisgIGZvcmVhY2goY29uc3QgUVZhcmlhbnQmIGdlbnJlLCBy ZXN1bHRNYXBfLnZhbHVlKFFMYXRpbjFTdHJpbmcoImdlbnJlcyIpKS50b0xpc3QoKSkgewogICAg IGdlbnJlcyA8PCBtYXBWYWx1ZShnZW5yZS50b01hcCgpLCAibmFtZSIpOwogICB9CiAgIGVudHJ5 Xy0+c2V0RmllbGQoUVN0cmluZ0xpdGVyYWwoImdlbnJlIiksIGdlbnJlcy5qb2luKEZpZWxkRm9y bWF0OjpkZWxpbWl0ZXJTdHJpbmcoKSkpOwoK