cppcheck is right that the check for preventing null deference of Query

is redundant in Redirect() as we can't reach the code with null anyway

[apt-pkg/acquire-method.cc:433]: (error) Possible null pointer dereference:
 Queue - otherwise it is redundant to check if Queue is null at line 425

diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc
index e9e1024..79a7519 100644 (file)
--- a/apt-pkg/acquire-method.cc
+++ b/apt-pkg/acquire-method.cc
@@ -421,12 +421,8 @@ void pkgAcqMethod::Status(const char *Format,...)
    to keep the pipeline synchronized. */
 void pkgAcqMethod::Redirect(const string &NewURI)
 {
-   std::cout << "103 Redirect\nURI: ";
-   if (Queue != 0)
-      std::cout << Queue->Uri << "\n";
-   else
-      std::cout << "<UNKNOWN>\n";
-   std::cout << "New-URI: " << NewURI << "\n"
+   std::cout << "103 Redirect\nURI: " << Queue->Uri << "\n"
+            << "New-URI: " << NewURI << "\n"
             << "\n" << std::flush;
 
    // Change the URI for the request.