X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferList.cpp;h=3865c72c8eaf13cf9b7b004e33dd21d7145b7913;hb=1e519d1115f41f71c253cb9e2fbb7803e9a583a9;hp=0b76f13b87308dd8dde5435e7bed9b9e7d28d133;hpb=489dca71cd99bbc78780fa40311a2eb042c0320e;p=lyx.git

diff --git a/src/BufferList.cpp b/src/BufferList.cpp
index 0b76f13b87..3865c72c8e 100644
--- a/src/BufferList.cpp
+++ b/src/BufferList.cpp
@@ -51,10 +51,8 @@ BufferList::BufferList()
 
 BufferList::~BufferList()
 {
-	BufferStorage::iterator it = binternal.begin();
-	BufferStorage::iterator end = binternal.end();
-	for (; it != end; ++it)
-		delete (*it);
+	for (Buffer * buf : binternal)
+		delete buf;
 }
 
 
@@ -96,10 +94,15 @@ void BufferList::release(Buffer * buf)
 	BufferStorage::iterator const it =
 		find(bstore.begin(), bstore.end(), buf);
 	if (it != bstore.end()) {
+		Buffer const * parent = buf->parent();
 		Buffer * tmp = (*it);
 		bstore.erase(it);
 		LASSERT(tmp, return);
 		delete tmp;
+		if (parent)
+			// If this was a child, update the parent's buffer
+			// to avoid crashes due to dangling pointers (bug 9979)
+			parent->updateBuffer();
 	}
 }
 
@@ -155,12 +158,8 @@ void BufferList::closeAll()
 FileNameList BufferList::fileNames() const
 {
 	FileNameList nvec;
-	BufferStorage::const_iterator it = bstore.begin();
-	BufferStorage::const_iterator end = bstore.end();
-	for (; it != end; ++it) {
-		Buffer * buf = *it;
+	for (Buffer const * buf : bstore)
 		nvec.push_back(buf->fileName());
-	}
 	return nvec;
 }
 
@@ -196,7 +195,7 @@ Buffer * BufferList::next(Buffer const * buf) const
 
 	if (bstore.empty())
 		return 0;
-	BufferStorage::const_iterator it = 
+	BufferStorage::const_iterator it =
 			find(bstore.begin(), bstore.end(), buf);
 	LASSERT(it != bstore.end(), return 0);
 	++it;
@@ -212,7 +211,7 @@ Buffer * BufferList::previous(Buffer const * buf) const
 
 	if (bstore.empty())
 		return 0;
-	BufferStorage::const_iterator it = 
+	BufferStorage::const_iterator it =
 			find(bstore.begin(), bstore.end(), buf);
 	LASSERT(it != bstore.end(), return 0);
 
@@ -226,26 +225,28 @@ void BufferList::updateIncludedTeXfiles(string const & masterTmpDir,
 {
 	OutputParams runparams = runparams_in;
 	runparams.is_child = true;
-	BufferStorage::iterator it = bstore.begin();
-	BufferStorage::iterator end = bstore.end();
-	for (; it != end; ++it) {
-		if (!(*it)->isDepClean(masterTmpDir)) {
-			string writefile = addName(masterTmpDir, (*it)->latexName());
-			(*it)->makeLaTeXFile(FileName(writefile), masterTmpDir,
+	for (Buffer * buf : bstore) {
+		if (!buf->isDepClean(masterTmpDir)) {
+			string writefile = addName(masterTmpDir, buf->latexName());
+			buf->makeLaTeXFile(FileName(writefile), masterTmpDir,
 					     runparams, Buffer::OnlyBody);
-			(*it)->markDepClean(masterTmpDir);
+			buf->markDepClean(masterTmpDir);
 		}
 	}
-	runparams.is_child = false;
 }
 
 
 void BufferList::emergencyWriteAll()
 {
-	BufferStorage::const_iterator it = bstore.begin();
-	BufferStorage::const_iterator const en = bstore.end();
-	for (; it != en; ++it)
-		 (*it)->emergencyWrite();
+	for (Buffer * buf : bstore)
+		 buf->emergencyWrite();
+}
+
+
+void BufferList::invalidateConverterCache() const
+{
+	for (Buffer const * buf : bstore)
+		buf->params().invalidateConverterCache();
 }
 
 
@@ -255,7 +256,7 @@ bool BufferList::exists(FileName const & fname) const
 }
 
 
- bool BufferList::isLoaded(Buffer const * b) const
+bool BufferList::isLoaded(Buffer const * b) const
 {
 	if (!b)
 		return false;
@@ -265,18 +266,28 @@ bool BufferList::exists(FileName const & fname) const
 }
 
 
-bool BufferList::isOthersChild(Buffer * parent, Buffer * child)
+bool BufferList::isInternal(Buffer const * b) const
+{
+	if (!b)
+		return false;
+	BufferStorage::const_iterator cit =
+		find(binternal.begin(), binternal.end(), b);
+	return cit != binternal.end();
+}
+
+
+bool BufferList::isOthersChild(Buffer * parent, Buffer * child) const
 {
 	LASSERT(parent, return false);
 	LASSERT(child, return false);
 	LASSERT(parent->isChild(child), return false);
-	
+
 	// Does child document have a different parent?
 	Buffer const * parent_ = child->parent();
 	if (parent_ && parent_ != parent)
 		return true;
 
-	for(Buffer * buf : bstore)
+	for(Buffer const * buf : bstore)
 		if (buf != parent && buf->isChild(child))
 			return true;
 	return false;
@@ -309,24 +320,19 @@ Buffer * BufferList::getBuffer(support::FileName const & fname, bool internal) c
 
 Buffer * BufferList::getBufferFromTmp(string const & s)
 {
-	BufferStorage::iterator it = bstore.begin();
-	BufferStorage::iterator end = bstore.end();
-	for (; it < end; ++it) {
-		if (prefixIs(s, (*it)->temppath())) {
+	for (Buffer * buf : bstore) {
+		if (prefixIs(s, buf->temppath())) {
 			// check whether the filename matches the master
-			string const master_name = (*it)->latexName();
+			string const master_name = buf->latexName();
 			if (suffixIs(s, master_name))
-				return *it;
+				return buf;
 			// if not, try with the children
-			ListOfBuffers clist = (*it)->getDescendents();
-			ListOfBuffers::const_iterator cit = clist.begin();
-			ListOfBuffers::const_iterator cend = clist.end();
-			for (; cit != cend; ++cit) {
+			for (Buffer * child : buf->getDescendents()) {
 				string const mangled_child_name = DocFileName(
-					changeExtension((*cit)->absFileName(),
+					changeExtension(child->absFileName(),
 						".tex")).mangledFileName();
 				if (suffixIs(s, mangled_child_name))
-					return *cit;
+					return child;
 			}
 		}
 	}
@@ -336,19 +342,15 @@ Buffer * BufferList::getBufferFromTmp(string const & s)
 
 void BufferList::recordCurrentAuthor(Author const & author)
 {
-	BufferStorage::iterator it = bstore.begin();
-	BufferStorage::iterator end = bstore.end();
-	for (; it != end; ++it)
-		(*it)->params().authors().recordCurrentAuthor(author);
+	for (Buffer * buf : bstore)
+		buf->params().authors().recordCurrentAuthor(author);
 }
 
 
 void BufferList::updatePreviews()
 {
-	BufferStorage::iterator it = bstore.begin();
-	BufferStorage::iterator end = bstore.end();
-	for (; it != end; ++it)
-		(*it)->updatePreviews();
+	for (Buffer * buf : bstore)
+		buf->updatePreviews();
 }
 
 
@@ -365,14 +367,10 @@ int BufferList::bufferNum(FileName const & fname) const
 
 void BufferList::changed(bool update_metrics) const
 {
-	BufferStorage::const_iterator it = bstore.begin();
-	BufferStorage::const_iterator end = bstore.end();
-	for (; it != end; ++it)
-		(*it)->changed(update_metrics);
-	it = binternal.begin();
-	end = binternal.end();
-	for (; it != end; ++it)
-		(*it)->changed(update_metrics);
+	for (Buffer const * buf : bstore)
+		buf->changed(update_metrics);
+	for (Buffer const * buf : binternal)
+		buf->changed(update_metrics);
 }