ALT Linux Team development discussions
 help / color / mirror / Atom feed
From: Aleksei Nikiforov <darktemplar@altlinux.org>
To: devel@lists.altlinux.org
Cc: Aleksei Nikiforov <darktemplar@altlinux.org>
Subject: [devel] [PATCH for apt v2 13/21] Cacheiterators: sanitize increment operators and end() function
Date: Thu, 12 Dec 2019 12:57:22 +0300
Message-ID: <20191212095730.83787-14-darktemplar@altlinux.org> (raw)
In-Reply-To: <20191212095730.83787-1-darktemplar@altlinux.org>

Make sure that these functions work properly even for default-constructed objects.
Found via clang-static-analyzer during investigation of:
API: Argument with 'nonnull' attribute passed null:
Null pointer passed as an argument to a 'nonnull' parameter
---
 apt/apt-pkg/cacheiterators.h | 22 +++++++++++-----------
 apt/apt-pkg/pkgcache.cc      |  3 +++
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/apt/apt-pkg/cacheiterators.h b/apt/apt-pkg/cacheiterators.h
index bad1e11..a4bf670 100644
--- a/apt/apt-pkg/cacheiterators.h
+++ b/apt/apt-pkg/cacheiterators.h
@@ -60,7 +60,7 @@ class pkgCache::PkgIterator
    // Iteration
    void operator ++(int);
    inline void operator ++() {operator ++(0);};
-   inline bool end() const {return Owner == 0 || Pkg == Owner->PkgP?true:false;};
+   inline bool end() const {return (Owner == 0 || Pkg == 0 || Pkg == Owner->PkgP);};
 
    // Comparison
    inline bool operator ==(const PkgIterator &B) const {return Pkg == B.Pkg;};
@@ -113,9 +113,9 @@ class pkgCache::VerIterator
    public:
 
    // Iteration
-   void operator ++(int) {if (Ver != Owner->VerP) Ver = Owner->VerP + Ver->NextVer;};
+   void operator ++(int) {if ((Owner != NULL) && (Ver != NULL) && (Ver != Owner->VerP)) Ver = Owner->VerP + Ver->NextVer;};
    inline void operator ++() {operator ++(0);};
-   inline bool end() const {return Ver == Owner->VerP?true:false;};
+   inline bool end() const {return (Owner == NULL || Ver == NULL || Ver == Owner->VerP);};
    inline void operator =(const VerIterator &B) {Ver = B.Ver; Owner = B.Owner;};
    
    // Comparison
@@ -175,10 +175,10 @@ class pkgCache::DepIterator
    public:
 
    // Iteration
-   void operator ++(int) {if (Dep != Owner->DepP) Dep = Owner->DepP +
+   void operator ++(int) {if ((Owner != NULL) && (Dep != NULL) && (Dep != Owner->DepP)) Dep = Owner->DepP +
 	(Type == DepVer?Dep->NextDepends:Dep->NextRevDepends);};
    inline void operator ++() {operator ++(0);};
-   inline bool end() const {return Owner == 0 || Dep == Owner->DepP?true:false;};
+   inline bool end() const {return (Owner == 0 || Dep == 0 || Dep == Owner->DepP);};
    
    // Comparison
    inline bool operator ==(const DepIterator &B) const {return Dep == B.Dep;};
@@ -254,10 +254,10 @@ class pkgCache::PrvIterator
    public:
 
    // Iteration
-   void operator ++(int) {if (Prv != Owner->ProvideP) Prv = Owner->ProvideP +
+   void operator ++(int) {if ((Owner != NULL) && (Prv != NULL) && (Prv != Owner->ProvideP)) Prv = Owner->ProvideP +
 	(Type == PrvVer?Prv->NextPkgProv:Prv->NextProvides);};
    inline void operator ++() {operator ++(0);};
-   inline bool end() const {return Prv == Owner->ProvideP?true:false;};
+   inline bool end() const {return (Owner == NULL || Prv == NULL || Prv == Owner->ProvideP);};
    
    // Comparison
    inline bool operator ==(const PrvIterator &B) const {return Prv == B.Prv;};
@@ -311,9 +311,9 @@ class pkgCache::PkgFileIterator
    public:
 
    // Iteration
-   void operator ++(int) {if (File!= Owner->PkgFileP) File = Owner->PkgFileP + File->NextFile;};
+   void operator ++(int) {if ((Owner != NULL) && (File != NULL) && (File!= Owner->PkgFileP)) File = Owner->PkgFileP + File->NextFile;};
    inline void operator ++() {operator ++(0);};
-   inline bool end() const {return File == Owner->PkgFileP?true:false;};
+   inline bool end() const {return (Owner == NULL || File == NULL || File == Owner->PkgFileP);};
 
    // Comparison
    inline bool operator ==(const PkgFileIterator &B) const {return File == B.File;};
@@ -364,9 +364,9 @@ class pkgCache::VerFileIterator
    public:
 
    // Iteration
-   void operator ++(int) {if (FileP != Owner->VerFileP) FileP = Owner->VerFileP + FileP->NextFile;};
+   void operator ++(int) {if ((Owner != NULL) && (FileP != NULL) && (FileP != Owner->VerFileP)) FileP = Owner->VerFileP + FileP->NextFile;};
    inline void operator ++() {operator ++(0);};
-   inline bool end() const {return FileP == Owner->VerFileP?true:false;};
+   inline bool end() const {return (Owner == NULL || FileP == NULL || FileP == Owner->VerFileP);};
 
    // Comparison
    inline bool operator ==(const VerFileIterator &B) const {return FileP == B.FileP;};
diff --git a/apt/apt-pkg/pkgcache.cc b/apt/apt-pkg/pkgcache.cc
index afefe3b..9965532 100644
--- a/apt/apt-pkg/pkgcache.cc
+++ b/apt/apt-pkg/pkgcache.cc
@@ -275,6 +275,9 @@ void pkgCache::PrvIterator::_dummy() {}
 /* This will advance to the next logical package in the hash table. */
 void pkgCache::PkgIterator::operator ++(int) 
 {
+   if ((Owner == NULL) || (Pkg == NULL))
+      return;
+
    // Follow the current links
    if (Pkg != Owner->PkgP)
       Pkg = Owner->PkgP + Pkg->NextPackage;
-- 
2.24.1



  parent reply	other threads:[~2019-12-12  9:57 UTC|newest]

Thread overview: 84+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-10 15:23 [devel] [PATCH for apt 00/38] Various fixes for Apt and basic integration test suite Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 01/38] Replace post-increments with pre-increments Aleksei Nikiforov
2019-12-10 18:21   ` Alexey Tourbin
2019-12-11  7:51     ` Aleksei Nikiforov
2019-12-11  8:11       ` Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 02/38] Use correct types and type specifiers Aleksei Nikiforov
2019-12-10 22:45   ` Dmitry V. Levin
2019-12-11  7:56     ` Aleksei Nikiforov
2019-12-11 23:48       ` Dmitry V. Levin
2019-12-12  9:57         ` [devel] [PATCH for apt v2 00/21] Various fixes for Apt and basic integration test suite Aleksei Nikiforov
2019-12-12  9:57           ` [devel] [PATCH for apt v2 01/21] Replace post-increments with pre-increments Aleksei Nikiforov
2019-12-12 21:32             ` Andrey Savchenko
2019-12-13  8:29               ` Aleksei Nikiforov
2019-12-13  9:11               ` [devel] [PATCH for apt v3 " Aleksei Nikiforov
2019-12-13  9:12               ` [devel] [PATCH for apt v4 09/21] Rework identical conditions Aleksei Nikiforov
2019-12-13  9:18               ` [devel] [PATCH for apt v4] Additional loops improvements and beautification Aleksei Nikiforov
2019-12-13  9:20                 ` Aleksei Nikiforov
2019-12-12  9:57           ` [devel] [PATCH for apt v2 02/21] Use correct types and type specifiers Aleksei Nikiforov
2019-12-12  9:57           ` [devel] [PATCH for apt v2 03/21] Fix potential memory corruption in pkgCache::DepIterator::AllTargets() Aleksei Nikiforov
2019-12-12  9:57           ` [devel] [PATCH for apt v2 04/21] Get rid of nullptr dereference Aleksei Nikiforov
2019-12-12  9:57           ` [devel] [PATCH for apt v2 05/21] Fix memory access outside of allocated buffer ranges Aleksei Nikiforov
2019-12-12  9:57           ` [devel] [PATCH for apt v2 06/21] Get rid of hardcoded array size Aleksei Nikiforov
2019-12-12  9:57           ` [devel] [PATCH for apt v2 07/21] Use signed types to detect IO errors Aleksei Nikiforov
2019-12-12  9:57           ` [devel] [PATCH for apt v2 08/21] Use 'explicit' keyword for constructors with one argument Aleksei Nikiforov
2019-12-12  9:57           ` [devel] [PATCH for apt v2 09/21] Rework identical conditions Aleksei Nikiforov
2019-12-12 19:55             ` Andrey Savchenko
2019-12-13  8:10               ` Aleksei Nikiforov
2019-12-13  8:21               ` [devel] [PATCH for apt v3 " Aleksei Nikiforov
2019-12-13  8:23               ` [devel] [PATCH for apt v3] DoList: optimize status modification loop Aleksei Nikiforov
2019-12-12  9:57           ` [devel] [PATCH for apt v2 10/21] Improve member variable initialization Aleksei Nikiforov
2019-12-12  9:57           ` [devel] [PATCH for apt v2 11/21] Remove useless variable shadowing Aleksei Nikiforov
2019-12-12 21:19             ` Andrey Savchenko
2019-12-12  9:57           ` [devel] [PATCH for apt v2 12/21] Fortify against buffer overflows Aleksei Nikiforov
2019-12-12  9:57           ` Aleksei Nikiforov [this message]
2019-12-12  9:57           ` [devel] [PATCH for apt v2 14/21] Fix memory leaks Aleksei Nikiforov
2019-12-12  9:57           ` [devel] [PATCH for apt v2 15/21] Fix incorrect delete operator Aleksei Nikiforov
2019-12-12  9:57           ` [devel] [PATCH for apt v2 16/21] Don't access uninitialized data Aleksei Nikiforov
2019-12-12  9:57           ` [devel] [PATCH for apt v2 17/21] Fix access after free error Aleksei Nikiforov
2019-12-12  9:57           ` [devel] [PATCH for apt v2 18/21] Apt-pipe: ensure mainloop function doesn't return uninitialized or garbage value Aleksei Nikiforov
2019-12-12  9:57           ` [devel] [PATCH for apt v2 19/21] Don't use uninitialized value Aleksei Nikiforov
2019-12-12  9:57           ` [devel] [PATCH for apt v2 20/21] Get rid of dangling invalid pointer Aleksei Nikiforov
2019-12-12  9:57           ` [devel] [PATCH for apt v2 21/21] Fix invalid check of Queue against zero Aleksei Nikiforov
2019-12-12 19:08             ` Andrey Savchenko
2019-12-13  7:25               ` Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 03/38] Fix potential memory corruption in pkgCache::DepIterator::AllTargets() Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 04/38] Get rid of nullptr dereference Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 05/38] Fix memory access outside of allocated buffer ranges Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 06/38] Get rid of hardcoded array size Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 07/38] Use signed types to detect IO errors Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 08/38] Use 'explicit' keyword for constructors with one argument Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 09/38] Rework identical conditions Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 10/38] Improve member variable initialization Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 11/38] Remove useless variable shadowing Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 12/38] Fortify against buffer overflows Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 13/38] Cacheiterators: sanitize increment operators and end() function Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 14/38] Fix memory leaks Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 15/38] Fix incorrect delete operator Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 16/38] Don't access uninitialized data Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 17/38] Fix access after free error Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 18/38] Apt-pipe: ensure mainloop function doesn't return uninitialized or garbage value Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 19/38] Don't use uninitialized value Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 20/38] Get rid of dangling invalid pointer Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 21/38] Fix invalid check of Queue against zero Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 22/38] Fix iterators comparison Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 23/38] Fortify ParseQuoteWord function Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 24/38] Improve ipv6 address handling Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 25/38] Check subsecond modification time for cached files Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 26/38] Fix warning about truncation of value of pkgCache::Header::HeaderSz Aleksei Nikiforov
2019-12-10 22:57   ` Dmitry V. Levin
2019-12-11  7:51     ` Aleksei Nikiforov
2019-12-11 23:41       ` Dmitry V. Levin
2019-12-12  7:38         ` Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 27/38] FileFd: all files are closed automatically Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 28/38] Fix resource leaks in pkgCacheFile class Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 29/38] Fix off by one error in dynamic mmap leading to resource leak Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 30/38] pkgCacheFile: call Close() function in destructor Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 31/38] pkgCacheFile: don't regenerate cache if it was already built Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 32/38] Add support for rpm's dbpath configuration Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 33/38] Import integration tests framework from Debian Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 34/38] Add initial integration tests Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 35/38] Add basic tests to ensure that lua and rpm scripts are called Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 36/38] Add http and https methods tests Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 37/38] Enable integration test suite during package build Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 38/38] Add code coverage support Aleksei Nikiforov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191212095730.83787-14-darktemplar@altlinux.org \
    --to=darktemplar@altlinux.org \
    --cc=devel@lists.altlinux.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

ALT Linux Team development discussions

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://lore.altlinux.org/devel/0 devel/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 devel devel/ http://lore.altlinux.org/devel \
		devel@altlinux.org devel@altlinux.ru devel@lists.altlinux.org devel@lists.altlinux.ru devel@linux.iplabs.ru mandrake-russian@linuxteam.iplabs.ru sisyphus@linuxteam.iplabs.ru
	public-inbox-index devel

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://lore.altlinux.org/org.altlinux.lists.devel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git