109764 2005-07-28 14:28:10 +0000 kpdf crashes on logout if it has a file open 2005-09-29 21:45:37 +0000 1 1 10 Unmaintained kpdf general unspecified RedHat Enterprise Linux Linux RESOLVED FIXED NOR crash --- 1 greenrd aacid hugo.costelha juampe mueller prigault 0 oldest_to_newest 361073 0 greenrd 2005-07-28 14:28:10 +0000 Version: (using KDE KDE 3.4.1) Installed from: RedHat RPMs Compiler: gcc version 4.0.1 20050720 (Red Hat 4.0.1-4) OS: Linux When I log out, the KDE crash handler appears and gives the following backtrace for kpdf: Using host libthread_db library "/lib/libthread_db.so.1". `system-supplied DSO at 0xfd4000' has disappeared; keeping its symbols. [Thread debugging using libthread_db enabled] [New Thread -1208186432 (LWP 23031)] [KCrash handler] #4 QGList::find (this=0x0, d=0xb9912c, fromStart=true) at tools/qglist.cpp:745 #5 0x00a9095b in KGlobal::registerStaticDeleter (obj=0xb9912c) at qptrlist.h:95 #6 0x00a26b3f in KSharedConfig (this=0xb6e06eb8, fileName=@0x0, readonly=false, usekdeglobals=true) at kstaticdeleter.h:109 #7 0x00a26c6b in KSharedConfig::openConfig (fileName=@0xbfbed004, immutable=false, useKDEGlobals=true) at kconfig.cpp:347 #8 0x00afe1db in KConfigSkeleton (this=0xb6e06e18, configname=@0xbfbed004) at kconfigskeleton.cpp:888 #9 0x00f03f37 in Settings (this=0xb6e06e18) at settings.cpp:22 #10 0x00f09e1e in Settings::self () at settings.cpp:14 #11 0x00e630bf in ~Part (this=0x8d162a8) at settings.h:288 #12 0x053b425e in QPtrList<QObject>::deleteItem (this=0x8d13bd0, d=0x8d162a8) at qptrlist.h:150 #13 0x04dadb1d in QGList::clear (this=0x8d13bd0) at tools/qglist.cpp:701 #14 0x00a9b333 in ~KLibrary (this=0x8d13b98) at qptrlist.h:93 #15 0x00a9c66d in KLibLoader::close_pending (this=0x8d115e8, wrap=0x0) at klibloader.cpp:516 #16 0x00a9ca93 in ~KLibLoader (this=0x8d115e8) at klibloader.cpp:328 #17 0x00a9a3fd in KLibLoader::cleanUp () at klibloader.cpp:298 #18 0x009fbfc9 in ~KApplication (this=0xbfbed524) at kapplication.cpp:1627 #19 0x0804eecc in main (argc=0, argv=0x0) at main.cpp:80 #20 0x0035941f in __libc_start_main (main=0x804ec70 <main>, argc=3, ubp_av=0xbfbed6e4, init=0x80506c4 <__libc_csu_init>, fini=0x8050714 <__libc_csu_fini>, rtld_fini=0x334c7d <_dl_fini>, stack_end=0xbfbed6dc) at ../sysdeps/generic/libc-start.c:231 #21 0x0804ebe1 in _start () 361083 1 eros.kde 2005-07-28 15:09:19 +0000 This seems a duplicate of the already fixed "Settings" crash. -- Email.it, the professional e-mail, gratis per te: http://www.email.it/f Sponsor: Con Tele2 risparmi al telefono e su Internet. Sempre. Clicca qui per conoscere le promozioni Clicca qui: http://adv.email.it/cgi-bin/foclick.cgi?mid=3757&d=28-7 361139 2 prigault 2005-07-28 18:32:56 +0000 Confirmed on KDE 3.4.2 . Same backtrace. > This seems a duplicate of the already fixed "Settings" crash. BugID ? It is clearly not fixed in 3.4 branch. 361140 3 aacid 2005-07-28 18:35:50 +0000 Well, that is quite a bold statement, i really can not reproduce that problem with kpdf 3.4.2. 361205 4 prigault 2005-07-29 00:27:09 +0000 100% reproducible here. KPDF doe not need to have a file open, by the way. Just open KPDF, log out of KDE -> crash. KDE 3.4.2 compiled from sources (using konstruct). GCC-3.4.3-22 on Fedora Core 3 x86_64 Debugdialog (output in .xsession-errors): <snip> ksmserver: completeShutdown: client kwin(1021224b1dd18a000112258897900000160160000) ksmserver: completeShutdown: client (1021224b1dd18a000112258897900000160160001) ksmserver: completeShutdown: client kdesktop(1021224b1dd18a000112258897900000160160003) ksmserver: completeShutdown: client kicker(1021224b1dd18a000112258897900000160160004) ksmserver: completeShutdown: client klipper(1021224b1dd18a000112258898000000160160005) ksmserver: completeShutdown: client korgac(1021224b1dd18a000112258898000000160160006) ksmserver: completeShutdown: client knotify(1021224b1dd18a000112258898000000160160007) ksmserver: completeShutdown: client kpdf(1021224b1dd18a000112258898400000160160008) ksmserver: We killed all clients. We have now clients.count()=8 ksmserver: KSMServer::completeKilling clients.count()=8 ksmserver: KSMServer::completeKilling clients.count()=7 kdecore (KLibLoader): The KLibLoader contains the library libkpdfpart (0x750f20) kdecore (KLibLoader): Factory still has object 0x758de0 unnamed Library = libkpdfpart kdecore (KConfigSkeleton): Creating KConfigSkeleton (0x8cd660) kdecore (KAction): KActionCollection::~KActionCollection(): this = 0x856f00 kdecore (KAccel): ~KAccel(): this = 0x85c500 kdecore (KAccel): ~KAccelBase(): this = 0x8560b0 kdecore (KAccel): KAccelActions::clear() kdecore (KAction): KAction::slotDestroyed(): this = 0x85d7d0, name = "toggleUrlGrabAction", sender = 0x85c500 kdecore (KAction): KAction::slotDestroyed(): this = 0x85e4e0, name = "clearHistoryAction", sender = 0x85c500 kdecore (KAction): KAction::slotDestroyed(): this = 0x85ebc0, name = "configureAction", sender = 0x85c500 kdecore (KAction): KAction::slotDestroyed(): this = 0x85f1f0, name = "quitAction", sender = 0x85c500 kdecore (KAction): KAction::~KAction( this = "toggleUrlGrabAction" ) kdecore (KAction): KAction::~KAction( this = "clearHistoryAction" ) kdecore (KAction): KAction::~KAction( this = "configureAction" ) kdecore (KAction): KAction::~KAction( this = "quitAction" ) kdecore (KAccel): ~KGlobalAccel(): this = 0x865c20 kdecore (KAccel): ~KAccelBase(): this = 0x863908 kdecore (KAccel): KAccelActions::clear() KCrash: crashing... crashRecursionCounter = 2 KCrash: Application Name = kpdf path = <unknown> pid = 16047 ksmserver: KSMServer::completeKilling clients.count()=6 DCOP: unregister 'kpdf-16047' <snip> 361214 5 prigault 2005-07-29 02:58:11 +0000 It happens on my 32-bit (i686) build of 3.4.2 too. Just so we rule that it is 64-bit specific. 361220 6 prigault 2005-07-29 03:59:23 +0000 Opps, typo. Just so we rule OUT a 64-bit specific bug. 370213 7 aacid 2005-09-01 17:49:15 +0000 *** Bug 110613 has been marked as a duplicate of this bug. *** 370228 8 aacid 2005-09-01 18:36:25 +0000 *** Bug 111886 has been marked as a duplicate of this bug. *** 370231 9 hugo.costelha 2005-09-01 18:55:02 +0000 Well, the description in bug 110613, reported by Juan Pedro Paredes, pretty much says where the problem seems to be. 370234 10 aacid 2005-09-01 19:07:01 +0000 Any of you is able of testing a patch against kde 3.5 branch? 370235 11 eros.kde 2005-09-01 19:08:45 +0000 Just a note from today's chat between Albert and me, to help collecting thoughts: [18:48] TSDgeos: because i just got 3 reports like that in a few days [18:49] TSDgeos: searched for that fix you mention and don't remember it [18:49] Koral: aahh! the infamous "Settings" stuff ? [18:49] TSDgeos: yeah [18:50] TSDgeos: wondering why it does not crash here [18:50] TSDgeos: and if we really fixed it [18:50] Koral: I referred to when Settings was renamed to KpdfSettings. that could have prevented more errors like this one.. [18:51] TSDgeos: ah [18:51] TSDgeos: no, i think it's different [18:51] Koral: Before the Settings class was renamed, I found that it could mean something and [18:52] Koral: In annotations I removed all Settings:: call in destructors [18:52] Koral: becouse I found that KStaticDeleter deleted the Setting class (from the KPART) BEFORE the DESTRUCTORS of classes [18:52] TSDgeos: where did you place the one about the splitters? [18:53] Koral: when the splitter is moved I think [18:53] Koral: (when it's dropped) [18:53] TSDgeos: ok, let's see if that helps 370239 12 12449 aacid 2005-09-01 19:28:35 +0000 Created attachment 12449 Patch that could fix it If anyone could test this patch (against 3.5 branch) and tell me if it works it would be great 370737 13 aacid 2005-09-04 10:24:05 +0000 Dirk any chance you could reproduce it and the patch works for you? 371119 14 mueller 2005-09-06 14:36:07 +0000 Albert: No, I'm unable to reproduce the crash (3.4branch). I just subscribed because it was reported in Novell bugzilla as well, so I can backport the fix when its done. 376747 15 juampe 2005-09-27 21:32:49 +0000 The patch works great for me. I can do dcop logout. Later all is restored. 377387 16 aacid 2005-09-29 21:45:37 +0000 SVN commit 465437 by aacid: Don't use KpdfSettings from the destructor as it seems to cause some problems for users, should fix bug 109764 BUGS: 109764 M +21 -5 part.cpp M +3 -0 part.h M +4 -0 ui/pageview.cpp M +1 -0 ui/thumbnaillist.cpp --- branches/KDE/3.5/kdegraphics/kpdf/part.cpp #465436:465437 @@ -267,6 +267,9 @@ splitterSizes.push_back( 500 ); } m_splitter->setSizes( splitterSizes ); + // get notified about splitter size changes (HACK that will be removed + // by connecting to Qt4::QSplitter's sliderMoved()) + m_pageView->installEventFilter( this ); m_watcher = new KDirWatch( this ); connect( m_watcher, SIGNAL( dirty( const QString& ) ), this, SLOT( slotFileDirty( const QString& ) ) ); m_dirtyHandler = new QTimer( this ); @@ -277,6 +280,7 @@ // [SPEECH] check for KTTSD presence and usability KTrader::OfferList offers = KTrader::self()->query("DCOP/Text-to-Speech", "Name == 'KTTSD'"); KpdfSettings::setUseKTTSD( (offers.count() > 0) ); + KpdfSettings::writeConfig(); // set our XML-UI resource file setXMLFile("part.rc"); @@ -285,11 +289,6 @@ Part::~Part() { - // save internal settings - KpdfSettings::setSplitterSizes( m_splitter->sizes() ); - // write to disk config file - KpdfSettings::writeConfig(); - delete m_document; if ( --m_count == 0 ) delete globalParams; @@ -475,10 +474,21 @@ return KParts::ReadOnlyPart::closeURL(); } +bool Part::eventFilter( QObject * watched, QEvent * e ) +{ + // if pageView has been resized, save splitter sizes + if ( watched == m_pageView && e->type() == QEvent::Resize ) + saveSplitterSize(); + + // only intercept events, don't block them + return false; +} + void Part::slotShowLeftPanel() { bool showLeft = m_showLeftPanel->isChecked(); KpdfSettings::setShowLeftPanel(showLeft); + KpdfSettings::writeConfig(); // show/hide left qtoolbox m_leftPanel->setShown( showLeft ); // this needs to be hidden explicitly to disable thumbnails gen @@ -572,6 +582,12 @@ KMessageBox::information(widget(), i18n("This link points to a quit application action that does not work when using the embedded viewer."), QString::null, "warnNoQuitIfNotInKPDF"); } +void Part::saveSplitterSize() +{ + KpdfSettings::setSplitterSizes( m_splitter->sizes() ); + KpdfSettings::writeConfig(); +} + //BEGIN go to page dialog class KPDFGotoPageDialog : public KDialogBase { --- branches/KDE/3.5/kdegraphics/kpdf/part.h #465436:465437 @@ -86,6 +86,8 @@ bool openFile(); bool openURL(const KURL &url); bool closeURL(); + // filter that watches for splitter size changes + bool eventFilter( QObject * watched, QEvent * e ); protected slots: void openURLFromDocument(const KURL &url); @@ -114,6 +116,7 @@ void enableTOC(bool enable); void psTransformEnded(); void cannotQuit(); + void saveSplitterSize(); void setMimeTypes(KIO::Job *job); public slots: --- branches/KDE/3.5/kdegraphics/kpdf/ui/pageview.cpp #465436:465437 @@ -1097,6 +1097,7 @@ { d->messageWindow->display( i18n("Starting KTTSD Failed: %1").arg(error) ); KpdfSettings::setUseKTTSD(false); + KpdfSettings::writeConfig(); } } if ( KpdfSettings::useKTTSD() ) @@ -1444,6 +1445,7 @@ // save selected zoom factor KpdfSettings::setZoomMode(newZoomMode); KpdfSettings::setZoomFactor(newFactor); + KpdfSettings::writeConfig(); } } @@ -1913,6 +1915,7 @@ if ( KpdfSettings::viewColumns() != newColumns ) { KpdfSettings::setViewColumns( newColumns ); + KpdfSettings::writeConfig(); if ( d->document->pages() > 0 ) slotRelayoutPages(); } @@ -1923,6 +1926,7 @@ if ( KpdfSettings::viewContinuous() != on ) { KpdfSettings::setViewContinuous( on ); + KpdfSettings::writeConfig(); if ( d->document->pages() > 0 ) slotRelayoutPages(); } --- branches/KDE/3.5/kdegraphics/kpdf/ui/thumbnaillist.cpp #465436:465437 @@ -247,6 +247,7 @@ { // save state KpdfSettings::setFilterBookmarks( filterOn ); + KpdfSettings::writeConfig(); // ask for the 'notifySetup' with a little trick (on reinsertion the // document sends the list again) m_document->removeObserver( this ); 12449 2005-09-01 19:28:35 +0000 2005-09-01 19:28:35 +0000 Patch that could fix it 109764.patch text/plain 4158 aacid SW5kZXg6IHBhcnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHBhcnQuY3BwCShyZXZpc2nDs246IDQ1NTg5 MykKKysrIHBhcnQuY3BwCShjb3BpYSBkZSB0cmFiYWpvKQpAQCAtMjYzLDYgKzI2Myw5IEBACiAJ CXNwbGl0dGVyU2l6ZXMucHVzaF9iYWNrKCA1MDAgKTsKIAl9CiAJbV9zcGxpdHRlci0+c2V0U2l6 ZXMoIHNwbGl0dGVyU2l6ZXMgKTsKKwkvLyBnZXQgbm90aWZpZWQgYWJvdXQgc3BsaXR0ZXIgc2l6 ZSBjaGFuZ2VzIChIQUNLIHRoYXQgd2lsbCBiZSByZW1vdmVkCisJLy8gYnkgY29ubmVjdGluZyB0 byBRdDQ6OlFTcGxpdHRlcidzIHNsaWRlck1vdmVkKCkpCisJbV9wYWdlVmlldy0+aW5zdGFsbEV2 ZW50RmlsdGVyKCB0aGlzICk7CiAJbV93YXRjaGVyID0gbmV3IEtEaXJXYXRjaCggdGhpcyApOwog CWNvbm5lY3QoIG1fd2F0Y2hlciwgU0lHTkFMKCBkaXJ0eSggY29uc3QgUVN0cmluZyYgKSApLCB0 aGlzLCBTTE9UKCBzbG90RmlsZURpcnR5KCBjb25zdCBRU3RyaW5nJiApICkgKTsKIAltX2RpcnR5 SGFuZGxlciA9IG5ldyBRVGltZXIoIHRoaXMgKTsKQEAgLTI3Myw2ICsyNzYsNyBAQAogCS8vIFtT UEVFQ0hdIGNoZWNrIGZvciBLVFRTRCBwcmVzZW5jZSBhbmQgdXNhYmlsaXR5CiAJS1RyYWRlcjo6 T2ZmZXJMaXN0IG9mZmVycyA9IEtUcmFkZXI6OnNlbGYoKS0+cXVlcnkoIkRDT1AvVGV4dC10by1T cGVlY2giLCAiTmFtZSA9PSAnS1RUU0QnIik7CiAJS3BkZlNldHRpbmdzOjpzZXRVc2VLVFRTRCgg KG9mZmVycy5jb3VudCgpID4gMCkgKTsKKwlLcGRmU2V0dGluZ3M6OndyaXRlQ29uZmlnKCk7CiAK IAkvLyBzZXQgb3VyIFhNTC1VSSByZXNvdXJjZSBmaWxlCiAJc2V0WE1MRmlsZSgicGFydC5yYyIp OwpAQCAtMjgxLDExICsyODUsNiBAQAogCiBQYXJ0Ojp+UGFydCgpCiB7Ci0gICAgLy8gc2F2ZSBp bnRlcm5hbCBzZXR0aW5ncwotICAgIEtwZGZTZXR0aW5nczo6c2V0U3BsaXR0ZXJTaXplcyggbV9z cGxpdHRlci0+c2l6ZXMoKSApOwotICAgIC8vIHdyaXRlIHRvIGRpc2sgY29uZmlnIGZpbGUKLSAg ICBLcGRmU2V0dGluZ3M6OndyaXRlQ29uZmlnKCk7Ci0KICAgICBkZWxldGUgbV9kb2N1bWVudDsK ICAgICBpZiAoIC0tbV9jb3VudCA9PSAwICkKICAgICAgICAgZGVsZXRlIGdsb2JhbFBhcmFtczsK QEAgLTQ2MywxMCArNDYyLDIxIEBACiAgICAgcmV0dXJuIEtQYXJ0czo6UmVhZE9ubHlQYXJ0Ojpj bG9zZVVSTCgpOwogfQogCitib29sIFBhcnQ6OmV2ZW50RmlsdGVyKCBRT2JqZWN0ICogd2F0Y2hl ZCwgUUV2ZW50ICogZSApCit7CisgICAgLy8gaWYgcGFnZVZpZXcgaGFzIGJlZW4gcmVzaXplZCwg c2F2ZSBzcGxpdHRlciBzaXplcworICAgIGlmICggd2F0Y2hlZCA9PSBtX3BhZ2VWaWV3ICYmIGUt PnR5cGUoKSA9PSBRRXZlbnQ6OlJlc2l6ZSApCisgICAgICAgIHNhdmVTcGxpdHRlclNpemUoKTsK KworICAgIC8vIG9ubHkgaW50ZXJjZXB0IGV2ZW50cywgZG9uJ3QgYmxvY2sgdGhlbQorICAgIHJl dHVybiBmYWxzZTsKK30KKwogdm9pZCBQYXJ0OjpzbG90U2hvd0xlZnRQYW5lbCgpCiB7CiAgICAg Ym9vbCBzaG93TGVmdCA9IG1fc2hvd0xlZnRQYW5lbC0+aXNDaGVja2VkKCk7CiAgICAgS3BkZlNl dHRpbmdzOjpzZXRTaG93TGVmdFBhbmVsKHNob3dMZWZ0KTsKKyAgICBLcGRmU2V0dGluZ3M6Ondy aXRlQ29uZmlnKCk7CiAgICAgLy8gc2hvdy9oaWRlIGxlZnQgcXRvb2xib3gKICAgICBtX2xlZnRQ YW5lbC0+c2V0U2hvd24oIHNob3dMZWZ0ICk7CiAgICAgLy8gdGhpcyBuZWVkcyB0byBiZSBoaWRk ZW4gZXhwbGljaXRseSB0byBkaXNhYmxlIHRodW1ibmFpbHMgZ2VuCkBAIC01NjAsNiArNTcwLDEy IEBACiAJS01lc3NhZ2VCb3g6OmluZm9ybWF0aW9uKHdpZGdldCgpLCBpMThuKCJUaGlzIGxpbmsg cG9pbnRzIHRvIGEgcXVpdCBhcHBsaWNhdGlvbiBhY3Rpb24gdGhhdCBkb2VzIG5vdCB3b3JrIHdo ZW4gdXNpbmcgdGhlIGVtYmVkZGVkIHZpZXdlci4iKSwgUVN0cmluZzo6bnVsbCwgIndhcm5Ob1F1 aXRJZk5vdEluS1BERiIpOwogfQogCit2b2lkIFBhcnQ6OnNhdmVTcGxpdHRlclNpemUoKQorewor ICAgIEtwZGZTZXR0aW5nczo6c2V0U3BsaXR0ZXJTaXplcyggbV9zcGxpdHRlci0+c2l6ZXMoKSAp OworICAgIEtwZGZTZXR0aW5nczo6d3JpdGVDb25maWcoKTsKK30gCisKIC8vQkVHSU4gZ28gdG8g cGFnZSBkaWFsb2cKIGNsYXNzIEtQREZHb3RvUGFnZURpYWxvZyA6IHB1YmxpYyBLRGlhbG9nQmFz ZQogewpJbmRleDogcGFydC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHBhcnQuaAkocmV2aXNpw7NuOiA0NTU4 MjEpCisrKyBwYXJ0LmgJKGNvcGlhIGRlIHRyYWJham8pCkBAIC04Niw2ICs4Niw4IEBACiAJYm9v bCBvcGVuRmlsZSgpOwogCWJvb2wgb3BlblVSTChjb25zdCBLVVJMICZ1cmwpOwogCWJvb2wgY2xv c2VVUkwoKTsKKyAgLy8gZmlsdGVyIHRoYXQgd2F0Y2hlcyBmb3Igc3BsaXR0ZXIgc2l6ZSBjaGFu Z2VzCisgIGJvb2wgZXZlbnRGaWx0ZXIoIFFPYmplY3QgKiB3YXRjaGVkLCBRRXZlbnQgKiBlICk7 CiAKIHByb3RlY3RlZCBzbG90czoKIAl2b2lkIG9wZW5VUkxGcm9tRG9jdW1lbnQoY29uc3QgS1VS TCAmdXJsKTsKQEAgLTExNCw2ICsxMTYsNyBAQAogCXZvaWQgZW5hYmxlVE9DKGJvb2wgZW5hYmxl KTsKIAl2b2lkIHBzVHJhbnNmb3JtRW5kZWQoKTsKIAl2b2lkIGNhbm5vdFF1aXQoKTsKKyAgdm9p ZCBzYXZlU3BsaXR0ZXJTaXplKCk7CiAKIHB1YmxpYyBzbG90czoKIAkvLyBjb25uZWN0ZWQgdG8g U2hlbGwgYWN0aW9uIChhbmQgYnJvd3NlckV4dGVuc2lvbiksIG5vdCBsb2NhbCBvbmUKSW5kZXg6 IHVpL3BhZ2V2aWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSB1aS9wYWdldmlldy5jcHAJKHJldmlzacOz bjogNDU1ODIxKQorKysgdWkvcGFnZXZpZXcuY3BwCShjb3BpYSBkZSB0cmFiYWpvKQpAQCAtMTA5 Niw2ICsxMDk2LDcgQEAKICAgICAgICAgICAgICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBkLT5tZXNzYWdlV2luZG93LT5kaXNwbGF5KCBpMThuKCJTdGFydGluZyBL VFRTRCBGYWlsZWQ6ICUxIikuYXJnKGVycm9yKSApOwogICAgICAgICAgICAgICAgICAgICAgICAg ICAgIEtwZGZTZXR0aW5nczo6c2V0VXNlS1RUU0QoZmFsc2UpOworICAgICAgICAgICAgICAgICAg ICAgICAgICAgIEtwZGZTZXR0aW5nczo6d3JpdGVDb25maWcoKTsKICAgICAgICAgICAgICAgICAg ICAgICAgIH0KICAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgICAgICBpZiAo IEtwZGZTZXR0aW5nczo6dXNlS1RUU0QoKSApCkBAIC0xNDQzLDYgKzE0NDQsNyBAQAogICAgICAg ICAvLyBzYXZlIHNlbGVjdGVkIHpvb20gZmFjdG9yCiAgICAgICAgIEtwZGZTZXR0aW5nczo6c2V0 Wm9vbU1vZGUobmV3Wm9vbU1vZGUpOwogICAgICAgICBLcGRmU2V0dGluZ3M6OnNldFpvb21GYWN0 b3IobmV3RmFjdG9yKTsKKyAgICAgICAgS3BkZlNldHRpbmdzOjp3cml0ZUNvbmZpZygpOwogICAg IH0KIH0KIApAQCAtMTkxMiw2ICsxOTE0LDcgQEAKICAgICBpZiAoIEtwZGZTZXR0aW5nczo6dmll d0NvbHVtbnMoKSAhPSBuZXdDb2x1bW5zICkKICAgICB7CiAgICAgICAgIEtwZGZTZXR0aW5nczo6 c2V0Vmlld0NvbHVtbnMoIG5ld0NvbHVtbnMgKTsKKyAgICAgICAgS3BkZlNldHRpbmdzOjp3cml0 ZUNvbmZpZygpOwogICAgICAgICBpZiAoIGQtPmRvY3VtZW50LT5wYWdlcygpID4gMCApCiAgICAg ICAgICAgICBzbG90UmVsYXlvdXRQYWdlcygpOwogICAgIH0KQEAgLTE5MjIsNiArMTkyNSw3IEBA CiAgICAgaWYgKCBLcGRmU2V0dGluZ3M6OnZpZXdDb250aW51b3VzKCkgIT0gb24gKQogICAgIHsK ICAgICAgICAgS3BkZlNldHRpbmdzOjpzZXRWaWV3Q29udGludW91cyggb24gKTsKKyAgICAgICAg S3BkZlNldHRpbmdzOjp3cml0ZUNvbmZpZygpOwogICAgICAgICBpZiAoIGQtPmRvY3VtZW50LT5w YWdlcygpID4gMCApCiAgICAgICAgICAgICBzbG90UmVsYXlvdXRQYWdlcygpOwogICAgIH0K