46287 2010-09-22 11:59:00 -0700 [Qt] Enable Netscape plugin metadata caching on Linux should not be set in QWebSettings::enablePersistentStorage 2010-10-15 07:01:38 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) All Linux RESOLVED FIXED Qt, QtTriaged P1 Normal --- 1 david.leong webkit-qt-unassigned ademar commit-queue david.leong hausmann kimmo.t.kinnunen kling laszlo.gombos oldest_to_newest 283116 0 david.leong 2010-09-22 11:59:00 -0700 Currently calling QWebSettings::enablePersistentStorage() function also calls setPersistentMetadataCacheEnabled(true); and setPersistentMetadataCachePath(storagePath); This functionality ties the persistant storage path with the plugin database path. Users may want to set a unique persistant path for different origins. Doing so will nullify the usefulness of the plugin cache. The plugin cache should be unique and sharable across the entire system. Can we change the plugin cache functionality from the persistent storage path and add a new internal API to set the plugin database path. 283119 1 david.leong 2010-09-22 11:59:30 -0700 Will post up a proposed patch. 283230 2 68434 david.leong 2010-09-22 13:56:31 -0700 Created attachment 68434 Proposed changes. Proposed change to move the netscape plugin path to a new private settings function. 283238 3 david.leong 2010-09-22 14:04:54 -0700 Talked to Laszlo, will make some changes to move it to QWebPage as a dynamic property. Will re-submit the patch. 284059 4 68612 david.leong 2010-09-23 16:03:42 -0700 Created attachment 68612 Proposed changes, v2 Updated to use QObject dynamic properties. 286167 5 kimmo.t.kinnunen 2010-09-28 04:12:24 -0700 (In reply to comment #4) > Created an attachment (id=68612) [details] > Proposed changes, v2 > > Updated to use QObject dynamic properties. In the original patch there was API for setting the cache db dir, but it got rejected. Adding Simon to the loop, he can decide about APIs.. See: http://bugs.webkit.org/show_bug.cgi?id=43179#c12 IMHO, probably makes sense to call the API, if there will be one, QWebSettings::setPluginCachePath(const QString &location) instead of event->propertyName() == "_q_NetscapePluginCachePath" 286172 6 laszlo.gombos 2010-09-28 04:28:00 -0700 I think for most "common" use-cases enabling the PersistentMetadataCache in QWebSettings::enablePersistentStorage() make sense. For QtWRT the PersistentMetadataCache should be "system-wide" while enablePersistentStorage set on a per widget basis, which tells me that the separate API to set a the PersistentMetadataCache path is justified for the performance gain. I proposed the dynamic property as the new exported symbol idea was already shut down. 286886 7 hausmann 2010-09-29 08:15:49 -0700 Hmm, I see the point of sharing the plugin cache path between different run-time widgets, but this doesn't only apply to the plugin cache but to all other caches, too. Why don't we change the behaviour of enablePersistentStorage() to put persistent storage into the provided storage path (or the DataLocation fallback) and put all _caches_ into a (documented) directory under QDesktopServices::CacheLocation? Basically I'm questioning if we really need an API if we can choose a sane default already in WebKit :) 287002 8 david.leong 2010-09-29 11:08:40 -0700 Sounds like we want to keep the enable netscape plugin cache call in enablePersistantStorage() but we would like to use QDesktopServices to save the cache file to a shared location? I will put up an updated patch based on Simon's comments. 287376 9 kimmo.t.kinnunen 2010-09-29 21:56:13 -0700 (In reply to comment #7) > Why don't we change the behaviour of enablePersistentStorage() to put persistent storage into the provided storage path (or the DataLocation fallback) and put all _caches_ into a (documented) directory under QDesktopServices::CacheLocation? > > > Basically I'm questioning if we really need an API if we can choose a sane default already in WebKit :) Sounds very wise. Probably with "all _caches_" you mean all app-global caches. E.g. data caches like http caches, html5 app cache content, icon db, etc. probably should stay at datalocation, as they may leak app-specific info. Also need to probably hardcode the caches path to ~/.appname/caches or something if the qdesktopservices is not available (the ifdef part).. And hope that the cachelocation call produces desired results on symbian.. 287422 10 hausmann 2010-09-30 01:16:36 -0700 (In reply to comment #9) > (In reply to comment #7) > > Why don't we change the behaviour of enablePersistentStorage() to put persistent storage into the provided storage path (or the DataLocation fallback) and put all _caches_ into a (documented) directory under QDesktopServices::CacheLocation? > > > > > > Basically I'm questioning if we really need an API if we can choose a sane default already in WebKit :) > > Sounds very wise. Probably with "all _caches_" you mean all app-global caches. E.g. data caches like http caches, html5 app cache content, icon db, etc. probably should stay at datalocation, as they may leak app-specific info. > > Also need to probably hardcode the caches path to ~/.appname/caches or something if the qdesktopservices is not available (the ifdef part).. > > And hope that the cachelocation call produces desired results on symbian.. I guess it really depends on what kind of leakage we're afraid of with the wrt, but I'd say any kind of storage that is a cache that can safely be deleted could be stored in a common location. If there's a bug in WebKit leaking information when it shouldn't, then we should fix that :) 288620 11 69552 david.leong 2010-10-01 18:06:01 -0700 Created attachment 69552 patch v3 Patch v3 based on Simon's idea. 288621 12 69553 david.leong 2010-10-01 18:09:15 -0700 Created attachment 69553 patch Sorry, attached the wrong file. Updated patch based on Simon's idea. 288622 13 69554 david.leong 2010-10-01 18:16:32 -0700 Created attachment 69554 patch Not having a good day with patches... fixed again. 288961 14 69554 laszlo.gombos 2010-10-04 09:01:23 -0700 Comment on attachment 69554 patch View in context: https://bugs.webkit.org/attachment.cgi?id=69554&action=review > WebKit/qt/Api/qwebsettings.cpp:1099 > + QString cachePath = QDesktopServices::storageLocation(QDesktopServices::DataLocation); Shouldn't this be QDesktopServices::CacheLocation instead ? I assume that DataLocation is not "system-wide" while CacheLocation would always point to the same location for all apps using QtWebKit. 288987 15 69645 david.leong 2010-10-04 10:06:58 -0700 Created attachment 69645 Updated to use cache location Works fine on my linux machine. Will try on meego to make sure too. 288997 16 david.leong 2010-10-04 10:21:55 -0700 Confirmed QDesktopLocation::CachePath working fine on Meego as well. The database gets saved to /home/user/.cache/organization/appname. So each app will have a copy of the cache but it sharable for any QtWebkit instance in the app. 289493 17 69554 hausmann 2010-10-05 01:28:23 -0700 Comment on attachment 69554 patch Clearning review as David uploaded a newer patch 289497 18 69645 hausmann 2010-10-05 01:30:06 -0700 Comment on attachment 69645 Updated to use cache location View in context: https://bugs.webkit.org/attachment.cgi?id=69645&action=review > WebKit/qt/Api/qwebsettings.cpp:1102 > +#ifndef QT_NO_DESKTOPSERVICES > + QString cachePath = QDesktopServices::storageLocation(QDesktopServices::CacheLocation); > +#else > + QString cachePath = WebCore::pathByAppendingComponent(QDir::homePath(), "QtWebkit"); > +#endif Should we really support QT_NO_DESKTOPSERVICES? IMHO we should not support persistent storage if this feature is not compiled into Qt. 290750 19 70024 david.leong 2010-10-06 18:35:14 -0700 Created attachment 70024 Updated again as per Simon's suggstion. Flag out enablePersistant storage completely if desktop services is not supported. 290759 20 70024 kling 2010-10-06 19:07:21 -0700 Comment on attachment 70024 Updated again as per Simon's suggstion. Please tick the "patch" checkbox when uploading patches. 290814 21 70024 kling 2010-10-06 22:42:46 -0700 Comment on attachment 70024 Updated again as per Simon's suggstion. View in context: https://bugs.webkit.org/attachment.cgi?id=70024&action=review > WebKit/qt/ChangeLog:6 > + should not be set in QWebSettings::enablePersistentStorage. What does this mean? > WebKit/qt/ChangeLog:11 > + QWebSettings::enablePersistentStorage will now store the netscape > + plugin cache to QDesktopServices::DataLocation. This is incorrect, should be QDesktopServices::CacheLocation. > WebKit/qt/Api/qwebsettings.cpp:1096 > + // Path is not configurable and uses QDesktop services by default. s/QDesktop services/QDesktopServices/ 291223 22 70142 david.leong 2010-10-07 13:27:34 -0700 Created attachment 70142 Fixed according to comments. Thanks for the quick review. I've fixed the patch as per the comments. 293257 23 70142 laszlo.gombos 2010-10-12 21:13:03 -0700 Comment on attachment 70142 Fixed according to comments. Looks good to me, r+. 293262 24 70142 commit-queue 2010-10-12 21:29:32 -0700 Comment on attachment 70142 Fixed according to comments. Clearing flags on attachment: 70142 Committed r69636: <http://trac.webkit.org/changeset/69636> 293263 25 commit-queue 2010-10-12 21:29:39 -0700 All reviewed patches have been landed. Closing bug. 294734 26 ademar 2010-10-15 07:01:28 -0700 Revision r69636 cherry-picked into qtwebkit-2.1 with commit 1551146 <http://gitorious.org/webkit/qtwebkit/commit/1551146> 68434 2010-09-22 13:56:31 -0700 2010-09-23 16:03:42 -0700 Proposed changes. 46287.patch text/plain 3260 david.leong SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gNjgwNzcpCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTAtMDktMjIgIERhdmlkIExlb25nICA8ZGF2aWQubGVv bmdAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIE1vdmUgTmV0c2NhcGUgcGx1Z2luIGNhY2hlIHBhdGggZnJvbSBRV2ViU2V0dGluZ3M6 OmVuYWJsZVBlcnNpc3RhbnRTdG9yYWdlCisgICAgICAgIHRvIGEgbmV3IGludGVybmFsIHNldHRl ciBmdW5jdGlvbi4gVGhlIE5ldHNjYXBlIHBsdWdpbiBjYWNoZSBwYXRoIHNob3VsZAorICAgICAg ICBub3QgYmUgYXNzb2NpYXRlZCB3aXRoIHRoZSBwZXJzaXN0YW50IHN0b3JhZ2UgcGF0aC4KKwor ICAgICAgICAqIEFwaS9xd2VicGx1Z2luZGF0YWJhc2UuY3BwOgorICAgICAgICBOZXcgU2V0dGVy IGZ1bmN0aW9uIGZvciB0aGUgTmV0c2NhcGUgcGx1Z2luIGNhY2hlLgorICAgICAgICAocXR3ZWJr aXRfd2VicGx1Z2luZGF0YWJhc2VfZW5hYmxlTmV0c2NhcGVQbHVnaW5NZXRhZGF0YUNhY2hlKToK KyAgICAgICAgCisgICAgICAgIFJlbW92ZWQgTmV0c2NhcGUgcGx1Z2luIGNhY2hlIHNldHRpbmcg ZnJvbSBwZXJzaXN0YW50IHN0b3JhZ2Ugc2V0dGluZy4KKyAgICAgICAgKiBBcGkvcXdlYnNldHRp bmdzLmNwcDoKKyAgICAgICAgKFFXZWJTZXR0aW5nczo6ZW5hYmxlUGVyc2lzdGVudFN0b3JhZ2Up OgorICAgICAgICAKKwogMjAxMC0wOS0yMiAgSmFtZXkgSGlja3MgIDxqYW1leS5oaWNrc0Bub2tp YS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4u CkluZGV4OiBXZWJLaXQvcXQvQXBpL3F3ZWJwbHVnaW5kYXRhYmFzZS5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViS2l0L3F0L0FwaS9xd2VicGx1Z2luZGF0YWJhc2UuY3BwCShyZXZpc2lvbiA2Nzk3MikK KysrIFdlYktpdC9xdC9BcGkvcXdlYnBsdWdpbmRhdGFiYXNlLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMjMsNiArMjMsMTEgQEAKICNpbmNsdWRlICJQbHVnaW5EYXRhYmFzZS5oIgogI2luY2x1ZGUg IlBsdWdpblBhY2thZ2UuaCIKIAorI2luY2x1ZGUgPFFEaXI+CisjaW5jbHVkZSA8UUNvcmVBcHBs aWNhdGlvbj4KKyNpbmNsdWRlIDxRRmlsZUluZm8+CisjaW5jbHVkZSA8UURlc2t0b3BTZXJ2aWNl cz4KKwogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKIC8qIQpAQCAtMzkxLDMgKzM5NiwyNyBA QCB2b2lkIFFXZWJQbHVnaW5EYXRhYmFzZTo6c2V0UHJlZmVycmVkUGx1CiB7CiAgICAgbV9kYXRh YmFzZS0+c2V0UHJlZmVycmVkUGx1Z2luRm9yTUlNRVR5cGUobWltZVR5cGUsIHBsdWdpbi5tX3Bh Y2thZ2UpOwogfQorCit2b2lkIFFXRUJLSVRfRVhQT1JUIHF0d2Via2l0X3dlYnBsdWdpbmRhdGFi YXNlX2VuYWJsZU5ldHNjYXBlUGx1Z2luTWV0YWRhdGFDYWNoZShjb25zdCBRU3RyaW5nJiBwYXRo KQoreworI2lmIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fTUVUQURBVEFfQ0FDSEUpCisgICAgUVN0 cmluZyBzdG9yYWdlUGF0aDsKKworICAgIGlmIChwYXRoLmlzRW1wdHkoKSkgeworI2lmbmRlZiBR VF9OT19ERVNLVE9QU0VSVklDRVMKKyAgICAgICAgc3RvcmFnZVBhdGggPSBRRGVza3RvcFNlcnZp Y2VzOjpzdG9yYWdlTG9jYXRpb24oUURlc2t0b3BTZXJ2aWNlczo6RGF0YUxvY2F0aW9uKTsKKyNl bmRpZgorICAgICAgICBpZiAoc3RvcmFnZVBhdGguaXNFbXB0eSgpKQorICAgICAgICAgICAgc3Rv cmFnZVBhdGggPSBXZWJDb3JlOjpwYXRoQnlBcHBlbmRpbmdDb21wb25lbnQoUURpcjo6aG9tZVBh dGgoKSwgUUNvcmVBcHBsaWNhdGlvbjo6YXBwbGljYXRpb25OYW1lKCkpOworICAgIH0gZWxzZQor ICAgICAgICBzdG9yYWdlUGF0aCA9IHBhdGg7CisKKyAgICBXZWJDb3JlOjptYWtlQWxsRGlyZWN0 b3JpZXMoc3RvcmFnZVBhdGgpOworCisgICAgUUZpbGVJbmZvIGluZm8oc3RvcmFnZVBhdGgpOwor ICAgIGlmIChpbmZvLmlzRGlyKCkgJiYgaW5mby5pc1dyaXRhYmxlKCkpIHsKKyAgICAgICAgV2Vi Q29yZTo6UGx1Z2luRGF0YWJhc2U6OnNldFBlcnNpc3RlbnRNZXRhZGF0YUNhY2hlRW5hYmxlZCh0 cnVlKTsKKyAgICAgICAgV2ViQ29yZTo6UGx1Z2luRGF0YWJhc2U6OnNldFBlcnNpc3RlbnRNZXRh ZGF0YUNhY2hlUGF0aChzdG9yYWdlUGF0aCk7CisgICAgfQorI2VuZGlmCit9CkluZGV4OiBXZWJL aXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0FwaS9x d2Vic2V0dGluZ3MuY3BwCShyZXZpc2lvbiA2Nzk3MikKKysrIFdlYktpdC9xdC9BcGkvcXdlYnNl dHRpbmdzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTA5MCwxNCArMTA5MCw2IEBAIHZvaWQgUVdl YlNldHRpbmdzOjplbmFibGVQZXJzaXN0ZW50U3RvcmEKICAgICBRV2ViU2V0dGluZ3M6Omdsb2Jh bFNldHRpbmdzKCktPnNldEF0dHJpYnV0ZShRV2ViU2V0dGluZ3M6OkxvY2FsU3RvcmFnZUVuYWJs ZWQsIHRydWUpOwogICAgIFFXZWJTZXR0aW5nczo6Z2xvYmFsU2V0dGluZ3MoKS0+c2V0QXR0cmli dXRlKFFXZWJTZXR0aW5nczo6T2ZmbGluZVN0b3JhZ2VEYXRhYmFzZUVuYWJsZWQsIHRydWUpOwog ICAgIFFXZWJTZXR0aW5nczo6Z2xvYmFsU2V0dGluZ3MoKS0+c2V0QXR0cmlidXRlKFFXZWJTZXR0 aW5nczo6T2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGVFbmFibGVkLCB0cnVlKTsKLQotI2lmIEVO QUJMRShORVRTQ0FQRV9QTFVHSU5fTUVUQURBVEFfQ0FDSEUpCi0gICAgUUZpbGVJbmZvIGluZm8o c3RvcmFnZVBhdGgpOwotICAgIGlmIChpbmZvLmlzRGlyKCkgJiYgaW5mby5pc1dyaXRhYmxlKCkp IHsKLSAgICAgICAgV2ViQ29yZTo6UGx1Z2luRGF0YWJhc2U6OnNldFBlcnNpc3RlbnRNZXRhZGF0 YUNhY2hlRW5hYmxlZCh0cnVlKTsKLSAgICAgICAgV2ViQ29yZTo6UGx1Z2luRGF0YWJhc2U6OnNl dFBlcnNpc3RlbnRNZXRhZGF0YUNhY2hlUGF0aChzdG9yYWdlUGF0aCk7Ci0gICAgfQotI2VuZGlm CiB9CiAKIC8qIQo= 68612 2010-09-23 16:03:42 -0700 2010-10-01 18:06:01 -0700 Proposed changes, v2 46287.patch text/plain 3453 david.leong SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gNjgyMDgpCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTAtMDktMjMgIERhdmlkIExlb25nICA8ZGF2aWQubGVv bmdAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICBbUXRdIEVuYWJsZSBOZXRzY2FwZSBwbHVnaW4gbWV0YWRhdGEgY2FjaGluZyBvbiBM aW51eCAKKyAgICAgICAgIHNob3VsZCBub3QgYmUgc2V0IGluIFFXZWJTZXR0aW5nczo6ZW5hYmxl UGVyc2lzdGVudFN0b3JhZ2UuCisKKyAgICAgICAgKiBBcGkvcXdlYnBhZ2UuY3BwOgorICAgICAg ICAoUVdlYlBhZ2VQcml2YXRlOjpkeW5hbWljUHJvcGVydHlDaGFuZ2VFdmVudCk6CisgICAgICAg IEFkZGVkIGR5bmFtaWMgcHJvcGVydHkgIl9xX05ldHNjYXBlUGx1Z2luQ2FjaGVQYXRoIiB0byBz ZXQgcGx1Z2luIGNhY2hlIHBhdGguCisgICAgICAgIFByb3BlcnR5IHNob3VsZCBiZSBzZXQgYXMg YSBRU3RyaW5nLgorICAgICAgICAqIEFwaS9xd2Vic2V0dGluZ3MuY3BwOgorICAgICAgICAoUVdl YlNldHRpbmdzOjplbmFibGVQZXJzaXN0ZW50U3RvcmFnZSk6CisgICAgICAgIFJlbW92ZWQgc2V0 dGluZyBvZiBOZXRzY2FwZSBQbHVnaW4gY2FjaGUgcGF0aCBmcm9tIHBlcnNpc3RhbnQgc3RvcmFn ZS4KKwogMjAxMC0wOS0yMyAgQWRlbWFyIGRlIFNvdXphIFJlaXMgSnIgIDxhZGVtYXIucmVpc0Bv cGVuYm9zc2Eub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9oZGUgQ2hyaXN0 aWFuc2VuLgpJbmRleDogV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAJKHJldmlzaW9uIDY3OTcyKQorKysgV2ViS2l0L3F0 L0FwaS9xd2VicGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTkzLDExICs5MywxNCBAQAogI2lu Y2x1ZGUgPFFCYXNpY1RpbWVyPgogI2luY2x1ZGUgPFFCaXRBcnJheT4KICNpbmNsdWRlIDxRRGVi dWc+CisjaW5jbHVkZSA8UURpcj4KKyNpbmNsdWRlIDxRRGVza3RvcFNlcnZpY2VzPgogI2luY2x1 ZGUgPFFEcmFnRW50ZXJFdmVudD4KICNpbmNsdWRlIDxRRHJhZ0xlYXZlRXZlbnQ+CiAjaW5jbHVk ZSA8UURyYWdNb3ZlRXZlbnQ+CiAjaW5jbHVkZSA8UURyb3BFdmVudD4KICNpbmNsdWRlIDxRRmls ZURpYWxvZz4KKyNpbmNsdWRlIDxRRmlsZUluZm8+CiAjaW5jbHVkZSA8UUh0dHBSZXF1ZXN0SGVh ZGVyPgogI2luY2x1ZGUgPFFJbnB1dERpYWxvZz4KICNpbmNsdWRlIDxRTG9jYWxlPgpAQCAtMTI2 Niw2ICsxMjY5LDI1IEBAIHZvaWQgUVdlYlBhZ2VQcml2YXRlOjpkeW5hbWljUHJvcGVydHlDaGEK ICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIH0KICAgICAgICAgfQorICAgIH0g ZWxzZSBpZiAoZXZlbnQtPnByb3BlcnR5TmFtZSgpID09ICJfcV9OZXRzY2FwZVBsdWdpbkNhY2hl UGF0aCIpIHsKKyNpZiBFTkFCTEUoTkVUU0NBUEVfUExVR0lOX01FVEFEQVRBX0NBQ0hFKQorICAg ICAgICBRU3RyaW5nIHN0b3JhZ2VQYXRoID0gcS0+cHJvcGVydHkoIl9xX05ldHNjYXBlUGx1Z2lu Q2FjaGVQYXRoIikudG9TdHJpbmcoKTsKKworICAgICAgICBpZiAoc3RvcmFnZVBhdGguaXNFbXB0 eSgpKSB7CisjaWZuZGVmIFFUX05PX0RFU0tUT1BTRVJWSUNFUworICAgICAgICAgICAgc3RvcmFn ZVBhdGggPSBRRGVza3RvcFNlcnZpY2VzOjpzdG9yYWdlTG9jYXRpb24oUURlc2t0b3BTZXJ2aWNl czo6RGF0YUxvY2F0aW9uKTsKKyNlbmRpZgorICAgICAgICAgICAgaWYgKHN0b3JhZ2VQYXRoLmlz RW1wdHkoKSkKKyAgICAgICAgICAgICAgICBzdG9yYWdlUGF0aCA9IFdlYkNvcmU6OnBhdGhCeUFw cGVuZGluZ0NvbXBvbmVudChRRGlyOjpob21lUGF0aCgpLCBRQ29yZUFwcGxpY2F0aW9uOjphcHBs aWNhdGlvbk5hbWUoKSk7CisgICAgICAgIH0gCisgICAgICAgIFdlYkNvcmU6Om1ha2VBbGxEaXJl Y3RvcmllcyhzdG9yYWdlUGF0aCk7CisKKyAgICAgICAgUUZpbGVJbmZvIGluZm8oc3RvcmFnZVBh dGgpOworICAgICAgICBpZiAoaW5mby5pc0RpcigpICYmIGluZm8uaXNXcml0YWJsZSgpKSB7Cisg ICAgICAgICAgICBXZWJDb3JlOjpQbHVnaW5EYXRhYmFzZTo6c2V0UGVyc2lzdGVudE1ldGFkYXRh Q2FjaGVFbmFibGVkKHRydWUpOworICAgICAgICAgICAgV2ViQ29yZTo6UGx1Z2luRGF0YWJhc2U6 OnNldFBlcnNpc3RlbnRNZXRhZGF0YUNhY2hlUGF0aChzdG9yYWdlUGF0aCk7CisgICAgICAgIH0K KyAgICAjZW5kaWYKICAgICB9CiAjaWYgRU5BQkxFKFRJTEVEX0JBQ0tJTkdfU1RPUkUpCiAgICAg ZWxzZSBpZiAoZXZlbnQtPnByb3BlcnR5TmFtZSgpID09ICJfcV9UaWxlZEJhY2tpbmdTdG9yZVRp bGVTaXplIikgewpJbmRleDogV2ViS2l0L3F0L0FwaS9xd2Vic2V0dGluZ3MuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmNwcAkocmV2aXNpb24gNjc5NzIpCisr KyBXZWJLaXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEwOTAs MTQgKzEwOTAsNiBAQCB2b2lkIFFXZWJTZXR0aW5nczo6ZW5hYmxlUGVyc2lzdGVudFN0b3JhCiAg ICAgUVdlYlNldHRpbmdzOjpnbG9iYWxTZXR0aW5ncygpLT5zZXRBdHRyaWJ1dGUoUVdlYlNldHRp bmdzOjpMb2NhbFN0b3JhZ2VFbmFibGVkLCB0cnVlKTsKICAgICBRV2ViU2V0dGluZ3M6Omdsb2Jh bFNldHRpbmdzKCktPnNldEF0dHJpYnV0ZShRV2ViU2V0dGluZ3M6Ok9mZmxpbmVTdG9yYWdlRGF0 YWJhc2VFbmFibGVkLCB0cnVlKTsKICAgICBRV2ViU2V0dGluZ3M6Omdsb2JhbFNldHRpbmdzKCkt PnNldEF0dHJpYnV0ZShRV2ViU2V0dGluZ3M6Ok9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5h YmxlZCwgdHJ1ZSk7Ci0KLSNpZiBFTkFCTEUoTkVUU0NBUEVfUExVR0lOX01FVEFEQVRBX0NBQ0hF KQotICAgIFFGaWxlSW5mbyBpbmZvKHN0b3JhZ2VQYXRoKTsKLSAgICBpZiAoaW5mby5pc0Rpcigp ICYmIGluZm8uaXNXcml0YWJsZSgpKSB7Ci0gICAgICAgIFdlYkNvcmU6OlBsdWdpbkRhdGFiYXNl OjpzZXRQZXJzaXN0ZW50TWV0YWRhdGFDYWNoZUVuYWJsZWQodHJ1ZSk7Ci0gICAgICAgIFdlYkNv cmU6OlBsdWdpbkRhdGFiYXNlOjpzZXRQZXJzaXN0ZW50TWV0YWRhdGFDYWNoZVBhdGgoc3RvcmFn ZVBhdGgpOwotICAgIH0KLSNlbmRpZgogfQogCiAvKiEK 69552 2010-10-01 18:06:01 -0700 2010-10-01 18:09:15 -0700 patch v3 46287.patch application/octet-stream 3453 david.leong SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gNjgyMDgpCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTAtMDktMjMgIERhdmlkIExlb25nICA8ZGF2aWQubGVv bmdAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICBbUXRdIEVuYWJsZSBOZXRzY2FwZSBwbHVnaW4gbWV0YWRhdGEgY2FjaGluZyBvbiBM aW51eCAKKyAgICAgICAgIHNob3VsZCBub3QgYmUgc2V0IGluIFFXZWJTZXR0aW5nczo6ZW5hYmxl UGVyc2lzdGVudFN0b3JhZ2UuCisKKyAgICAgICAgKiBBcGkvcXdlYnBhZ2UuY3BwOgorICAgICAg ICAoUVdlYlBhZ2VQcml2YXRlOjpkeW5hbWljUHJvcGVydHlDaGFuZ2VFdmVudCk6CisgICAgICAg IEFkZGVkIGR5bmFtaWMgcHJvcGVydHkgIl9xX05ldHNjYXBlUGx1Z2luQ2FjaGVQYXRoIiB0byBz ZXQgcGx1Z2luIGNhY2hlIHBhdGguCisgICAgICAgIFByb3BlcnR5IHNob3VsZCBiZSBzZXQgYXMg YSBRU3RyaW5nLgorICAgICAgICAqIEFwaS9xd2Vic2V0dGluZ3MuY3BwOgorICAgICAgICAoUVdl YlNldHRpbmdzOjplbmFibGVQZXJzaXN0ZW50U3RvcmFnZSk6CisgICAgICAgIFJlbW92ZWQgc2V0 dGluZyBvZiBOZXRzY2FwZSBQbHVnaW4gY2FjaGUgcGF0aCBmcm9tIHBlcnNpc3RhbnQgc3RvcmFn ZS4KKwogMjAxMC0wOS0yMyAgQWRlbWFyIGRlIFNvdXphIFJlaXMgSnIgIDxhZGVtYXIucmVpc0Bv cGVuYm9zc2Eub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9oZGUgQ2hyaXN0 aWFuc2VuLgpJbmRleDogV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAJKHJldmlzaW9uIDY3OTcyKQorKysgV2ViS2l0L3F0 L0FwaS9xd2VicGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTkzLDExICs5MywxNCBAQAogI2lu Y2x1ZGUgPFFCYXNpY1RpbWVyPgogI2luY2x1ZGUgPFFCaXRBcnJheT4KICNpbmNsdWRlIDxRRGVi dWc+CisjaW5jbHVkZSA8UURpcj4KKyNpbmNsdWRlIDxRRGVza3RvcFNlcnZpY2VzPgogI2luY2x1 ZGUgPFFEcmFnRW50ZXJFdmVudD4KICNpbmNsdWRlIDxRRHJhZ0xlYXZlRXZlbnQ+CiAjaW5jbHVk ZSA8UURyYWdNb3ZlRXZlbnQ+CiAjaW5jbHVkZSA8UURyb3BFdmVudD4KICNpbmNsdWRlIDxRRmls ZURpYWxvZz4KKyNpbmNsdWRlIDxRRmlsZUluZm8+CiAjaW5jbHVkZSA8UUh0dHBSZXF1ZXN0SGVh ZGVyPgogI2luY2x1ZGUgPFFJbnB1dERpYWxvZz4KICNpbmNsdWRlIDxRTG9jYWxlPgpAQCAtMTI2 Niw2ICsxMjY5LDI1IEBAIHZvaWQgUVdlYlBhZ2VQcml2YXRlOjpkeW5hbWljUHJvcGVydHlDaGEK ICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIH0KICAgICAgICAgfQorICAgIH0g ZWxzZSBpZiAoZXZlbnQtPnByb3BlcnR5TmFtZSgpID09ICJfcV9OZXRzY2FwZVBsdWdpbkNhY2hl UGF0aCIpIHsKKyNpZiBFTkFCTEUoTkVUU0NBUEVfUExVR0lOX01FVEFEQVRBX0NBQ0hFKQorICAg ICAgICBRU3RyaW5nIHN0b3JhZ2VQYXRoID0gcS0+cHJvcGVydHkoIl9xX05ldHNjYXBlUGx1Z2lu Q2FjaGVQYXRoIikudG9TdHJpbmcoKTsKKworICAgICAgICBpZiAoc3RvcmFnZVBhdGguaXNFbXB0 eSgpKSB7CisjaWZuZGVmIFFUX05PX0RFU0tUT1BTRVJWSUNFUworICAgICAgICAgICAgc3RvcmFn ZVBhdGggPSBRRGVza3RvcFNlcnZpY2VzOjpzdG9yYWdlTG9jYXRpb24oUURlc2t0b3BTZXJ2aWNl czo6RGF0YUxvY2F0aW9uKTsKKyNlbmRpZgorICAgICAgICAgICAgaWYgKHN0b3JhZ2VQYXRoLmlz RW1wdHkoKSkKKyAgICAgICAgICAgICAgICBzdG9yYWdlUGF0aCA9IFdlYkNvcmU6OnBhdGhCeUFw cGVuZGluZ0NvbXBvbmVudChRRGlyOjpob21lUGF0aCgpLCBRQ29yZUFwcGxpY2F0aW9uOjphcHBs aWNhdGlvbk5hbWUoKSk7CisgICAgICAgIH0gCisgICAgICAgIFdlYkNvcmU6Om1ha2VBbGxEaXJl Y3RvcmllcyhzdG9yYWdlUGF0aCk7CisKKyAgICAgICAgUUZpbGVJbmZvIGluZm8oc3RvcmFnZVBh dGgpOworICAgICAgICBpZiAoaW5mby5pc0RpcigpICYmIGluZm8uaXNXcml0YWJsZSgpKSB7Cisg ICAgICAgICAgICBXZWJDb3JlOjpQbHVnaW5EYXRhYmFzZTo6c2V0UGVyc2lzdGVudE1ldGFkYXRh Q2FjaGVFbmFibGVkKHRydWUpOworICAgICAgICAgICAgV2ViQ29yZTo6UGx1Z2luRGF0YWJhc2U6 OnNldFBlcnNpc3RlbnRNZXRhZGF0YUNhY2hlUGF0aChzdG9yYWdlUGF0aCk7CisgICAgICAgIH0K KyAgICAjZW5kaWYKICAgICB9CiAjaWYgRU5BQkxFKFRJTEVEX0JBQ0tJTkdfU1RPUkUpCiAgICAg ZWxzZSBpZiAoZXZlbnQtPnByb3BlcnR5TmFtZSgpID09ICJfcV9UaWxlZEJhY2tpbmdTdG9yZVRp bGVTaXplIikgewpJbmRleDogV2ViS2l0L3F0L0FwaS9xd2Vic2V0dGluZ3MuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmNwcAkocmV2aXNpb24gNjc5NzIpCisr KyBXZWJLaXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEwOTAs MTQgKzEwOTAsNiBAQCB2b2lkIFFXZWJTZXR0aW5nczo6ZW5hYmxlUGVyc2lzdGVudFN0b3JhCiAg ICAgUVdlYlNldHRpbmdzOjpnbG9iYWxTZXR0aW5ncygpLT5zZXRBdHRyaWJ1dGUoUVdlYlNldHRp bmdzOjpMb2NhbFN0b3JhZ2VFbmFibGVkLCB0cnVlKTsKICAgICBRV2ViU2V0dGluZ3M6Omdsb2Jh bFNldHRpbmdzKCktPnNldEF0dHJpYnV0ZShRV2ViU2V0dGluZ3M6Ok9mZmxpbmVTdG9yYWdlRGF0 YWJhc2VFbmFibGVkLCB0cnVlKTsKICAgICBRV2ViU2V0dGluZ3M6Omdsb2JhbFNldHRpbmdzKCkt PnNldEF0dHJpYnV0ZShRV2ViU2V0dGluZ3M6Ok9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5h YmxlZCwgdHJ1ZSk7Ci0KLSNpZiBFTkFCTEUoTkVUU0NBUEVfUExVR0lOX01FVEFEQVRBX0NBQ0hF KQotICAgIFFGaWxlSW5mbyBpbmZvKHN0b3JhZ2VQYXRoKTsKLSAgICBpZiAoaW5mby5pc0Rpcigp ICYmIGluZm8uaXNXcml0YWJsZSgpKSB7Ci0gICAgICAgIFdlYkNvcmU6OlBsdWdpbkRhdGFiYXNl OjpzZXRQZXJzaXN0ZW50TWV0YWRhdGFDYWNoZUVuYWJsZWQodHJ1ZSk7Ci0gICAgICAgIFdlYkNv cmU6OlBsdWdpbkRhdGFiYXNlOjpzZXRQZXJzaXN0ZW50TWV0YWRhdGFDYWNoZVBhdGgoc3RvcmFn ZVBhdGgpOwotICAgIH0KLSNlbmRpZgogfQogCiAvKiEK 69553 2010-10-01 18:09:15 -0700 2010-10-06 18:35:14 -0700 patch 46287.patch text/plain 2284 david.leong SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gNjg5NjApCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTAtMTAtMDEgIERhdmlkIExlb25nICA8ZGF2aWQubGVv bmdAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFtRdF0gRW5hYmxlIE5ldHNjYXBlIHBsdWdpbiBtZXRhZGF0YSBjYWNoaW5nIG9uIExp bnV4IAorICAgICAgICBzaG91bGQgbm90IGJlIHNldCBpbiBRV2ViU2V0dGluZ3M6OmVuYWJsZVBl cnNpc3RlbnRTdG9yYWdlLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD00NjI4NworICAgICAgICAKKyAgICAgICAgUVdlYlNldHRpbmdzOjplbmFibGVQ ZXJzaXN0ZW50U3RvcmFnZSB3aWxsIG5vdyBzdG9yZSB0aGUgbmV0c2NhcGUKKyAgICAgICAgcGx1 Z2luIGNhY2hlIHRvIFFEZXNrdG9wU2VydmljZXM6OkRhdGFMb2NhdGlvbiBpZiBRRGVza3RvcFNl cnZpY2VzIAorICAgICAgICBpcyBhdmFpbGFibGUsIG90aGVyd2lzZSBRRGlyOjpob21lUGF0aCgp L1F0V2Via2l0LgorICAgICAgICAKKyAgICAgICAgKiBBcGkvcXdlYnNldHRpbmdzLmNwcDoKKyAg ICAgICAgKFFXZWJTZXR0aW5nczo6ZW5hYmxlUGVyc2lzdGVudFN0b3JhZ2UpOgorCiAyMDEwLTA5 LTMwICBSb2JlcnQgSG9nYW4gIDxyb2JlcnRAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdl ZCBieSBBbmRyZWFzIEtsaW5nLgpJbmRleDogV2ViS2l0L3F0L0FwaS9xd2Vic2V0dGluZ3MuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmNwcAkocmV2aXNpb24g Njc5NzIpCisrKyBXZWJLaXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTEwOTEsMTMgKzEwOTEsMjMgQEAgdm9pZCBRV2ViU2V0dGluZ3M6OmVuYWJsZVBlcnNpc3Rl bnRTdG9yYQogICAgIFFXZWJTZXR0aW5nczo6Z2xvYmFsU2V0dGluZ3MoKS0+c2V0QXR0cmlidXRl KFFXZWJTZXR0aW5nczo6T2ZmbGluZVN0b3JhZ2VEYXRhYmFzZUVuYWJsZWQsIHRydWUpOwogICAg IFFXZWJTZXR0aW5nczo6Z2xvYmFsU2V0dGluZ3MoKS0+c2V0QXR0cmlidXRlKFFXZWJTZXR0aW5n czo6T2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGVFbmFibGVkLCB0cnVlKTsKIAotICAgIFFGaWxl SW5mbyBpbmZvKHN0b3JhZ2VQYXRoKTsKKyAgICAvLyBBbGwgYXBwbGljYXRpb25zIGNhbiBzaGFy ZSB0aGUgY29tbW9uIFF0V2Via2l0IGNhY2hlIGZpbGUocykuCisgICAgLy8gUGF0aCBpcyBub3Qg Y29uZmlndXJhYmxlIGFuZCB1c2VzIFFEZXNrdG9wIHNlcnZpY2VzIGJ5IGRlZmF1bHQsCisgICAg Ly8gb3IgdXNlcidzIGhvbWUgZGlyZWN0b3J5L1F0V2Via2l0IGlmIGl0IGRvZXMgbm90IGV4aXN0 LgorI2lmbmRlZiBRVF9OT19ERVNLVE9QU0VSVklDRVMKKyAgICBRU3RyaW5nIGNhY2hlUGF0aCA9 IFFEZXNrdG9wU2VydmljZXM6OnN0b3JhZ2VMb2NhdGlvbihRRGVza3RvcFNlcnZpY2VzOjpEYXRh TG9jYXRpb24pOworI2Vsc2UKKyAgICBRU3RyaW5nIGNhY2hlUGF0aCA9IFdlYkNvcmU6OnBhdGhC eUFwcGVuZGluZ0NvbXBvbmVudChRRGlyOjpob21lUGF0aCgpLCAiUXRXZWJraXQiKTsKKyNlbmRp ZgorCisgICAgV2ViQ29yZTo6bWFrZUFsbERpcmVjdG9yaWVzKGNhY2hlUGF0aCk7CisKKyAgICBR RmlsZUluZm8gaW5mbyhjYWNoZVBhdGgpOwogICAgIGlmIChpbmZvLmlzRGlyKCkgJiYgaW5mby5p c1dyaXRhYmxlKCkpIHsKKyAgICAgICAgcURlYnVnKCkgPDwgIlFXZWJTZXR0aW5nczo6ZW5hYmxl UGVyc2lzdGFudFN0b3JhZ2UgTlAgUGF0aCIgPDwgY2FjaGVQYXRoOwogICAgICAgICBXZWJDb3Jl OjpQbHVnaW5EYXRhYmFzZTo6c2V0UGVyc2lzdGVudE1ldGFkYXRhQ2FjaGVFbmFibGVkKHRydWUp OwotICAgICAgICBXZWJDb3JlOjpQbHVnaW5EYXRhYmFzZTo6c2V0UGVyc2lzdGVudE1ldGFkYXRh Q2FjaGVQYXRoKHN0b3JhZ2VQYXRoKTsKKyAgICAgICAgV2ViQ29yZTo6UGx1Z2luRGF0YWJhc2U6 OnNldFBlcnNpc3RlbnRNZXRhZGF0YUNhY2hlUGF0aChjYWNoZVBhdGgpOwogICAgIH0KIH0KIAog LyohCg== 69554 2010-10-01 18:16:32 -0700 2010-10-06 18:35:14 -0700 patch 46287.patch text/plain 2144 david.leong SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gNjg5NjApCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTAtMTAtMDEgIERhdmlkIExlb25nICA8ZGF2aWQubGVv bmdAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFtRdF0gRW5hYmxlIE5ldHNjYXBlIHBsdWdpbiBtZXRhZGF0YSBjYWNoaW5nIG9uIExp bnV4IAorICAgICAgICBzaG91bGQgbm90IGJlIHNldCBpbiBRV2ViU2V0dGluZ3M6OmVuYWJsZVBl cnNpc3RlbnRTdG9yYWdlLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD00NjI4NworICAgICAgICAKKyAgICAgICAgUVdlYlNldHRpbmdzOjplbmFibGVQ ZXJzaXN0ZW50U3RvcmFnZSB3aWxsIG5vdyBzdG9yZSB0aGUgbmV0c2NhcGUKKyAgICAgICAgcGx1 Z2luIGNhY2hlIHRvIFFEZXNrdG9wU2VydmljZXM6OkRhdGFMb2NhdGlvbiBpZiBRRGVza3RvcFNl cnZpY2VzIAorICAgICAgICBpcyBhdmFpbGFibGUsIG90aGVyd2lzZSBRRGlyOjpob21lUGF0aCgp L1F0V2Via2l0LgorICAgICAgICAKKyAgICAgICAgKiBBcGkvcXdlYnNldHRpbmdzLmNwcDoKKyAg ICAgICAgKFFXZWJTZXR0aW5nczo6ZW5hYmxlUGVyc2lzdGVudFN0b3JhZ2UpOgorCiAyMDEwLTA5 LTMwICBSb2JlcnQgSG9nYW4gIDxyb2JlcnRAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdl ZCBieSBBbmRyZWFzIEtsaW5nLgpJbmRleDogV2ViS2l0L3F0L0FwaS9xd2Vic2V0dGluZ3MuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmNwcAkocmV2aXNpb24g Njc5NzIpCisrKyBXZWJLaXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTEwOTIsMTAgKzEwOTIsMjEgQEAgdm9pZCBRV2ViU2V0dGluZ3M6OmVuYWJsZVBlcnNpc3Rl bnRTdG9yYQogICAgIFFXZWJTZXR0aW5nczo6Z2xvYmFsU2V0dGluZ3MoKS0+c2V0QXR0cmlidXRl KFFXZWJTZXR0aW5nczo6T2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGVFbmFibGVkLCB0cnVlKTsK IAogI2lmIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fTUVUQURBVEFfQ0FDSEUpCi0gICAgUUZpbGVJ bmZvIGluZm8oc3RvcmFnZVBhdGgpOworICAgIC8vIEFsbCBhcHBsaWNhdGlvbnMgY2FuIHNoYXJl IHRoZSBjb21tb24gUXRXZWJraXQgY2FjaGUgZmlsZShzKS4KKyAgICAvLyBQYXRoIGlzIG5vdCBj b25maWd1cmFibGUgYW5kIHVzZXMgUURlc2t0b3Agc2VydmljZXMgYnkgZGVmYXVsdCwKKyAgICAv LyBvciB1c2VyJ3MgaG9tZSBkaXJlY3RvcnkvUXRXZWJraXQgaWYgaXQgZG9lcyBub3QgZXhpc3Qu CisjaWZuZGVmIFFUX05PX0RFU0tUT1BTRVJWSUNFUworICAgIFFTdHJpbmcgY2FjaGVQYXRoID0g UURlc2t0b3BTZXJ2aWNlczo6c3RvcmFnZUxvY2F0aW9uKFFEZXNrdG9wU2VydmljZXM6OkRhdGFM b2NhdGlvbik7CisjZWxzZQorICAgIFFTdHJpbmcgY2FjaGVQYXRoID0gV2ViQ29yZTo6cGF0aEJ5 QXBwZW5kaW5nQ29tcG9uZW50KFFEaXI6OmhvbWVQYXRoKCksICJRdFdlYmtpdCIpOworI2VuZGlm CisKKyAgICBXZWJDb3JlOjptYWtlQWxsRGlyZWN0b3JpZXMoY2FjaGVQYXRoKTsKKworICAgIFFG aWxlSW5mbyBpbmZvKGNhY2hlUGF0aCk7CiAgICAgaWYgKGluZm8uaXNEaXIoKSAmJiBpbmZvLmlz V3JpdGFibGUoKSkgewogICAgICAgICBXZWJDb3JlOjpQbHVnaW5EYXRhYmFzZTo6c2V0UGVyc2lz dGVudE1ldGFkYXRhQ2FjaGVFbmFibGVkKHRydWUpOwotICAgICAgICBXZWJDb3JlOjpQbHVnaW5E YXRhYmFzZTo6c2V0UGVyc2lzdGVudE1ldGFkYXRhQ2FjaGVQYXRoKHN0b3JhZ2VQYXRoKTsKKyAg ICAgICAgV2ViQ29yZTo6UGx1Z2luRGF0YWJhc2U6OnNldFBlcnNpc3RlbnRNZXRhZGF0YUNhY2hl UGF0aChjYWNoZVBhdGgpOwogICAgIH0KICNlbmRpZgogfQo= 69645 2010-10-04 10:06:58 -0700 2010-10-06 18:35:14 -0700 Updated to use cache location 46287.patch text/plain 2145 david.leong SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gNjg5NjApCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTAtMTAtMDEgIERhdmlkIExlb25nICA8ZGF2aWQubGVv bmdAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFtRdF0gRW5hYmxlIE5ldHNjYXBlIHBsdWdpbiBtZXRhZGF0YSBjYWNoaW5nIG9uIExp bnV4IAorICAgICAgICBzaG91bGQgbm90IGJlIHNldCBpbiBRV2ViU2V0dGluZ3M6OmVuYWJsZVBl cnNpc3RlbnRTdG9yYWdlLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD00NjI4NworICAgICAgICAKKyAgICAgICAgUVdlYlNldHRpbmdzOjplbmFibGVQ ZXJzaXN0ZW50U3RvcmFnZSB3aWxsIG5vdyBzdG9yZSB0aGUgbmV0c2NhcGUKKyAgICAgICAgcGx1 Z2luIGNhY2hlIHRvIFFEZXNrdG9wU2VydmljZXM6OkRhdGFMb2NhdGlvbiBpZiBRRGVza3RvcFNl cnZpY2VzIAorICAgICAgICBpcyBhdmFpbGFibGUsIG90aGVyd2lzZSBRRGlyOjpob21lUGF0aCgp L1F0V2Via2l0LgorICAgICAgICAKKyAgICAgICAgKiBBcGkvcXdlYnNldHRpbmdzLmNwcDoKKyAg ICAgICAgKFFXZWJTZXR0aW5nczo6ZW5hYmxlUGVyc2lzdGVudFN0b3JhZ2UpOgorCiAyMDEwLTA5 LTMwICBSb2JlcnQgSG9nYW4gIDxyb2JlcnRAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdl ZCBieSBBbmRyZWFzIEtsaW5nLgpJbmRleDogV2ViS2l0L3F0L0FwaS9xd2Vic2V0dGluZ3MuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmNwcAkocmV2aXNpb24g Njc5NzIpCisrKyBXZWJLaXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTEwOTIsMTAgKzEwOTIsMjEgQEAgdm9pZCBRV2ViU2V0dGluZ3M6OmVuYWJsZVBlcnNpc3Rl bnRTdG9yYQogICAgIFFXZWJTZXR0aW5nczo6Z2xvYmFsU2V0dGluZ3MoKS0+c2V0QXR0cmlidXRl KFFXZWJTZXR0aW5nczo6T2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGVFbmFibGVkLCB0cnVlKTsK IAogI2lmIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fTUVUQURBVEFfQ0FDSEUpCi0gICAgUUZpbGVJ bmZvIGluZm8oc3RvcmFnZVBhdGgpOworICAgIC8vIEFsbCBhcHBsaWNhdGlvbnMgY2FuIHNoYXJl IHRoZSBjb21tb24gUXRXZWJraXQgY2FjaGUgZmlsZShzKS4KKyAgICAvLyBQYXRoIGlzIG5vdCBj b25maWd1cmFibGUgYW5kIHVzZXMgUURlc2t0b3Agc2VydmljZXMgYnkgZGVmYXVsdCwKKyAgICAv LyBvciB1c2VyJ3MgaG9tZSBkaXJlY3RvcnkvUXRXZWJraXQgaWYgaXQgZG9lcyBub3QgZXhpc3Qu CisjaWZuZGVmIFFUX05PX0RFU0tUT1BTRVJWSUNFUworICAgIFFTdHJpbmcgY2FjaGVQYXRoID0g UURlc2t0b3BTZXJ2aWNlczo6c3RvcmFnZUxvY2F0aW9uKFFEZXNrdG9wU2VydmljZXM6OkNhY2hl TG9jYXRpb24pOworI2Vsc2UKKyAgICBRU3RyaW5nIGNhY2hlUGF0aCA9IFdlYkNvcmU6OnBhdGhC eUFwcGVuZGluZ0NvbXBvbmVudChRRGlyOjpob21lUGF0aCgpLCAiUXRXZWJraXQiKTsKKyNlbmRp ZgorCisgICAgV2ViQ29yZTo6bWFrZUFsbERpcmVjdG9yaWVzKGNhY2hlUGF0aCk7CisKKyAgICBR RmlsZUluZm8gaW5mbyhjYWNoZVBhdGgpOwogICAgIGlmIChpbmZvLmlzRGlyKCkgJiYgaW5mby5p c1dyaXRhYmxlKCkpIHsKICAgICAgICAgV2ViQ29yZTo6UGx1Z2luRGF0YWJhc2U6OnNldFBlcnNp c3RlbnRNZXRhZGF0YUNhY2hlRW5hYmxlZCh0cnVlKTsKLSAgICAgICAgV2ViQ29yZTo6UGx1Z2lu RGF0YWJhc2U6OnNldFBlcnNpc3RlbnRNZXRhZGF0YUNhY2hlUGF0aChzdG9yYWdlUGF0aCk7Cisg ICAgICAgIFdlYkNvcmU6OlBsdWdpbkRhdGFiYXNlOjpzZXRQZXJzaXN0ZW50TWV0YWRhdGFDYWNo ZVBhdGgoY2FjaGVQYXRoKTsKICAgICB9CiAjZW5kaWYKIH0K 70024 2010-10-06 18:35:14 -0700 2010-10-07 13:27:34 -0700 Updated again as per Simon's suggstion. 46287-3.patch text/plain 2397 david.leong SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gNjg5NjApCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTAtMTAtMDEgIERhdmlkIExlb25nICA8ZGF2aWQubGVv bmdAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFtRdF0gRW5hYmxlIE5ldHNjYXBlIHBsdWdpbiBtZXRhZGF0YSBjYWNoaW5nIG9uIExp bnV4IAorICAgICAgICBzaG91bGQgbm90IGJlIHNldCBpbiBRV2ViU2V0dGluZ3M6OmVuYWJsZVBl cnNpc3RlbnRTdG9yYWdlLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD00NjI4NworICAgICAgICAKKyAgICAgICAgUVdlYlNldHRpbmdzOjplbmFibGVQ ZXJzaXN0ZW50U3RvcmFnZSB3aWxsIG5vdyBzdG9yZSB0aGUgbmV0c2NhcGUKKyAgICAgICAgcGx1 Z2luIGNhY2hlIHRvIFFEZXNrdG9wU2VydmljZXM6OkRhdGFMb2NhdGlvbi4KKyAgICAgICAgCisg ICAgICAgICogQXBpL3F3ZWJzZXR0aW5ncy5jcHA6CisgICAgICAgIChRV2ViU2V0dGluZ3M6OmVu YWJsZVBlcnNpc3RlbnRTdG9yYWdlKToKKwogMjAxMC0wOS0zMCAgUm9iZXJ0IEhvZ2FuICA8cm9i ZXJ0QHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQW5kcmVhcyBLbGluZy4KSW5k ZXg6IFdlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQv cXQvQXBpL3F3ZWJzZXR0aW5ncy5jcHAJKHJldmlzaW9uIDY3OTcyKQorKysgV2ViS2l0L3F0L0Fw aS9xd2Vic2V0dGluZ3MuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDcwLDEyICsxMDcwLDEyIEBA IFFTdHJpbmcgUVdlYlNldHRpbmdzOjpsb2NhbFN0b3JhZ2VQYXRoKCkKICovCiB2b2lkIFFXZWJT ZXR0aW5nczo6ZW5hYmxlUGVyc2lzdGVudFN0b3JhZ2UoY29uc3QgUVN0cmluZyYgcGF0aCkKIHsK KyNpZm5kZWYgUVRfTk9fREVTS1RPUFNFUlZJQ0VTCiAgICAgUVN0cmluZyBzdG9yYWdlUGF0aDsK IAogICAgIGlmIChwYXRoLmlzRW1wdHkoKSkgewotI2lmbmRlZiBRVF9OT19ERVNLVE9QU0VSVklD RVMKKwogICAgICAgICBzdG9yYWdlUGF0aCA9IFFEZXNrdG9wU2VydmljZXM6OnN0b3JhZ2VMb2Nh dGlvbihRRGVza3RvcFNlcnZpY2VzOjpEYXRhTG9jYXRpb24pOwotI2VuZGlmCiAgICAgICAgIGlm IChzdG9yYWdlUGF0aC5pc0VtcHR5KCkpCiAgICAgICAgICAgICBzdG9yYWdlUGF0aCA9IFdlYkNv cmU6OnBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudChRRGlyOjpob21lUGF0aCgpLCBRQ29yZUFwcGxp Y2F0aW9uOjphcHBsaWNhdGlvbk5hbWUoKSk7CiAgICAgfSBlbHNlCkBAIC0xMDkyLDEyICsxMDky LDE5IEBAIHZvaWQgUVdlYlNldHRpbmdzOjplbmFibGVQZXJzaXN0ZW50U3RvcmEKICAgICBRV2Vi U2V0dGluZ3M6Omdsb2JhbFNldHRpbmdzKCktPnNldEF0dHJpYnV0ZShRV2ViU2V0dGluZ3M6Ok9m ZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZCwgdHJ1ZSk7CiAKICNpZiBFTkFCTEUoTkVU U0NBUEVfUExVR0lOX01FVEFEQVRBX0NBQ0hFKQotICAgIFFGaWxlSW5mbyBpbmZvKHN0b3JhZ2VQ YXRoKTsKKyAgICAvLyBBbGwgYXBwbGljYXRpb25zIGNhbiBzaGFyZSB0aGUgY29tbW9uIFF0V2Vi a2l0IGNhY2hlIGZpbGUocykuCisgICAgLy8gUGF0aCBpcyBub3QgY29uZmlndXJhYmxlIGFuZCB1 c2VzIFFEZXNrdG9wIHNlcnZpY2VzIGJ5IGRlZmF1bHQuCisgICAgUVN0cmluZyBjYWNoZVBhdGgg PSBRRGVza3RvcFNlcnZpY2VzOjpzdG9yYWdlTG9jYXRpb24oUURlc2t0b3BTZXJ2aWNlczo6Q2Fj aGVMb2NhdGlvbik7CisgICAgV2ViQ29yZTo6bWFrZUFsbERpcmVjdG9yaWVzKGNhY2hlUGF0aCk7 CisKKyAgICBRRmlsZUluZm8gaW5mbyhjYWNoZVBhdGgpOwogICAgIGlmIChpbmZvLmlzRGlyKCkg JiYgaW5mby5pc1dyaXRhYmxlKCkpIHsKICAgICAgICAgV2ViQ29yZTo6UGx1Z2luRGF0YWJhc2U6 OnNldFBlcnNpc3RlbnRNZXRhZGF0YUNhY2hlRW5hYmxlZCh0cnVlKTsKLSAgICAgICAgV2ViQ29y ZTo6UGx1Z2luRGF0YWJhc2U6OnNldFBlcnNpc3RlbnRNZXRhZGF0YUNhY2hlUGF0aChzdG9yYWdl UGF0aCk7CisgICAgICAgIFdlYkNvcmU6OlBsdWdpbkRhdGFiYXNlOjpzZXRQZXJzaXN0ZW50TWV0 YWRhdGFDYWNoZVBhdGgoY2FjaGVQYXRoKTsKICAgICB9CiAjZW5kaWYKKyNlbmRpZgogfQogCiAv KiEK 70142 2010-10-07 13:27:34 -0700 2010-10-12 21:29:32 -0700 Fixed according to comments. 46287-4.patch text/plain 2341 david.leong SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gNjg5NjApCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTAtMTAtMDEgIERhdmlkIExlb25nICA8ZGF2aWQubGVv bmdAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFtRdF0gRW5hYmxlIE5ldHNjYXBlIHBsdWdpbiBtZXRhZGF0YSBjYWNoaW5nIG9uIExp bnV4IAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDYy ODcKKyAgICAgICAgCisgICAgICAgIFFXZWJTZXR0aW5nczo6ZW5hYmxlUGVyc2lzdGVudFN0b3Jh Z2Ugd2lsbCBub3cgc3RvcmUgdGhlIG5ldHNjYXBlCisgICAgICAgIHBsdWdpbiBjYWNoZSB0byBR RGVza3RvcFNlcnZpY2VzOjpDYWNoZUxvY2F0aW9uLgorICAgICAgICAKKyAgICAgICAgKiBBcGkv cXdlYnNldHRpbmdzLmNwcDoKKyAgICAgICAgKFFXZWJTZXR0aW5nczo6ZW5hYmxlUGVyc2lzdGVu dFN0b3JhZ2UpOgorCiAyMDEwLTA5LTMwICBSb2JlcnQgSG9nYW4gIDxyb2JlcnRAd2Via2l0Lm9y Zz4KIAogICAgICAgICBSZXZpZXdlZCBieSBBbmRyZWFzIEtsaW5nLgpJbmRleDogV2ViS2l0L3F0 L0FwaS9xd2Vic2V0dGluZ3MuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9xdC9BcGkvcXdlYnNl dHRpbmdzLmNwcAkocmV2aXNpb24gNjc5NzIpCisrKyBXZWJLaXQvcXQvQXBpL3F3ZWJzZXR0aW5n cy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEwNzAsMTIgKzEwNzAsMTIgQEAgUVN0cmluZyBRV2Vi U2V0dGluZ3M6OmxvY2FsU3RvcmFnZVBhdGgoKQogKi8KIHZvaWQgUVdlYlNldHRpbmdzOjplbmFi bGVQZXJzaXN0ZW50U3RvcmFnZShjb25zdCBRU3RyaW5nJiBwYXRoKQogeworI2lmbmRlZiBRVF9O T19ERVNLVE9QU0VSVklDRVMKICAgICBRU3RyaW5nIHN0b3JhZ2VQYXRoOwogCiAgICAgaWYgKHBh dGguaXNFbXB0eSgpKSB7Ci0jaWZuZGVmIFFUX05PX0RFU0tUT1BTRVJWSUNFUworCiAgICAgICAg IHN0b3JhZ2VQYXRoID0gUURlc2t0b3BTZXJ2aWNlczo6c3RvcmFnZUxvY2F0aW9uKFFEZXNrdG9w U2VydmljZXM6OkRhdGFMb2NhdGlvbik7Ci0jZW5kaWYKICAgICAgICAgaWYgKHN0b3JhZ2VQYXRo LmlzRW1wdHkoKSkKICAgICAgICAgICAgIHN0b3JhZ2VQYXRoID0gV2ViQ29yZTo6cGF0aEJ5QXBw ZW5kaW5nQ29tcG9uZW50KFFEaXI6OmhvbWVQYXRoKCksIFFDb3JlQXBwbGljYXRpb246OmFwcGxp Y2F0aW9uTmFtZSgpKTsKICAgICB9IGVsc2UKQEAgLTEwOTIsMTIgKzEwOTIsMTggQEAgdm9pZCBR V2ViU2V0dGluZ3M6OmVuYWJsZVBlcnNpc3RlbnRTdG9yYQogICAgIFFXZWJTZXR0aW5nczo6Z2xv YmFsU2V0dGluZ3MoKS0+c2V0QXR0cmlidXRlKFFXZWJTZXR0aW5nczo6T2ZmbGluZVdlYkFwcGxp Y2F0aW9uQ2FjaGVFbmFibGVkLCB0cnVlKTsKIAogI2lmIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5f TUVUQURBVEFfQ0FDSEUpCi0gICAgUUZpbGVJbmZvIGluZm8oc3RvcmFnZVBhdGgpOworICAgIC8v IEFsbCBhcHBsaWNhdGlvbnMgY2FuIHNoYXJlIHRoZSBjb21tb24gUXRXZWJraXQgY2FjaGUgZmls ZShzKS4KKyAgICAvLyBQYXRoIGlzIG5vdCBjb25maWd1cmFibGUgYW5kIHVzZXMgUURlc2t0b3BT ZXJ2aWNlczo6Q2FjaGVMb2NhdGlvbiBieSBkZWZhdWx0LgorICAgIFFTdHJpbmcgY2FjaGVQYXRo ID0gUURlc2t0b3BTZXJ2aWNlczo6c3RvcmFnZUxvY2F0aW9uKFFEZXNrdG9wU2VydmljZXM6OkNh Y2hlTG9jYXRpb24pOworICAgIFdlYkNvcmU6Om1ha2VBbGxEaXJlY3RvcmllcyhjYWNoZVBhdGgp OworCisgICAgUUZpbGVJbmZvIGluZm8oY2FjaGVQYXRoKTsKICAgICBpZiAoaW5mby5pc0Rpcigp ICYmIGluZm8uaXNXcml0YWJsZSgpKSB7CiAgICAgICAgIFdlYkNvcmU6OlBsdWdpbkRhdGFiYXNl OjpzZXRQZXJzaXN0ZW50TWV0YWRhdGFDYWNoZUVuYWJsZWQodHJ1ZSk7Ci0gICAgICAgIFdlYkNv cmU6OlBsdWdpbkRhdGFiYXNlOjpzZXRQZXJzaXN0ZW50TWV0YWRhdGFDYWNoZVBhdGgoc3RvcmFn ZVBhdGgpOworICAgICAgICBXZWJDb3JlOjpQbHVnaW5EYXRhYmFzZTo6c2V0UGVyc2lzdGVudE1l dGFkYXRhQ2FjaGVQYXRoKGNhY2hlUGF0aCk7CiAgICAgfQogI2VuZGlmCisjZW5kaWYKIH0KIAog LyohCg==