Avoid using buffer() which might throw an exception

Actually buffer_ is always valid on this codepath, but coverity is not
able to see that.

diff --git a/src/insets/InsetBibitem.cpp b/src/insets/InsetBibitem.cpp
index ae6105bb62fce88dee3faf058ab8616f73bab9ee..afc30ae37d395647c16ac4391912fb0ea43c835d 100644 (file)
--- a/src/insets/InsetBibitem.cpp
+++ b/src/insets/InsetBibitem.cpp
@@ -69,10 +69,10 @@ InsetBibitem::InsetBibitem(Buffer * buf, InsetCommandParams const & p)
 InsetBibitem::~InsetBibitem()
 {
        if (isBufferLoaded()) {
-               /* Coverity believes that this may throw an exception, but
-                * actually this code path is not taken when buffer_ == 0 */
-               LATTEST(buffer_);
-               buffer().invalidateBibinfoCache();
+               /* We do not use buffer() because Coverity believes that this
+                * may throw an exception. Actually this code path is not
+                * taken when buffer_ == 0 */
+               buffer_->invalidateBibinfoCache();
        }
 }
 

diff --git a/src/insets/InsetBibtex.cpp b/src/insets/InsetBibtex.cpp
index 99a7d55f82fb2a1b26c471c37044f8bca44d9a6d..f417d0abc5473648151abf8124e230fb02661ec5 100644 (file)
--- a/src/insets/InsetBibtex.cpp
+++ b/src/insets/InsetBibtex.cpp
@@ -68,12 +68,11 @@ InsetBibtex::InsetBibtex(Buffer * buf, InsetCommandParams const & p)
 InsetBibtex::~InsetBibtex()
 {
        if (isBufferLoaded()) {
-               /* Coverity believes that this may throw an exception, but
-                * actually this code path is not taken when buffer_ == 0 */
-               // coverity[fun_call_w_exception]
-               buffer().invalidateBibfileCache();
-               // coverity[fun_call_w_exception]
-               buffer().removeBiblioTempFiles();
+               /* We do not use buffer() because Coverity believes that this
+                * may throw an exception. Actually this code path is not
+                * taken when buffer_ == 0 */
+               buffer_-> invalidateBibfileCache();
+               buffer_->removeBiblioTempFiles();
        }
 }
 

diff --git a/src/insets/InsetCitation.cpp b/src/insets/InsetCitation.cpp
index fe752246f53460ba85c554d9113ff5db0a93c3fa..1b3c482d9b40c7330a36f045b508c55399c581d2 100644 (file)
--- a/src/insets/InsetCitation.cpp
+++ b/src/insets/InsetCitation.cpp
@@ -55,10 +55,10 @@ InsetCitation::InsetCitation(Buffer * buf, InsetCommandParams const & p)
 InsetCitation::~InsetCitation()
 {
        if (isBufferLoaded())
-               /* Coverity believes that this may throw an exception, but
-                * actually this code path is not taken when buffer_ == 0 */
-               // coverity[fun_call_w_exception]
-               buffer().removeBiblioTempFiles();
+               /* We do not use buffer() because Coverity believes that this
+                * may throw an exception. Actually this code path is not
+                * taken when buffer_ == 0 */
+               buffer_->removeBiblioTempFiles();
 }
 
 

diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
index 0d67f9dbd50f0f14e0917b960027925b97223062..341115cbb323eba2bed325684c0805876f2b4bce 100644 (file)
--- a/src/insets/InsetInclude.cpp
+++ b/src/insets/InsetInclude.cpp
@@ -198,10 +198,10 @@ InsetInclude::InsetInclude(InsetInclude const & other)
 InsetInclude::~InsetInclude()
 {
        if (isBufferLoaded())
-               /* Coverity believes that this may throw an exception, but
-                * actually this code path is not taken when buffer_ == 0 */
-               // coverity[exn_spec_violation]
-               buffer().invalidateBibfileCache();
+               /* We do not use buffer() because Coverity believes that this
+                * may throw an exception. Actually this code path is not
+                * taken when buffer_ == 0 */
+               buffer_->invalidateBibfileCache();
        delete label_;
 }