[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdelibs/frameworks] tier1/solid/src/solid/backends/wmi: Fix null pointer access in solid
From:       Ivan Miraglia <miraglia.ivan () gmail ! com>
Date:       2012-07-27 11:45:11
Message-ID: 20120727114511.5FB00A6094 () git ! kde ! org
[Download RAW message or body]

Git commit be921346a92d86d4a486fe30ae35bac7a01b64c3 by Ivan Miraglia.
Committed on 27/07/2012 at 13:36.
Pushed by ivanmiraglia into branch 'frameworks'.

Fix null pointer access in solid

Avoid null pointer access when managing null WmiQuery::Item

REVIEW: 105652

M  +6    -3    tier1/solid/src/solid/backends/wmi/wmiquery.cpp

http://commits.kde.org/kdelibs/be921346a92d86d4a486fe30ae35bac7a01b64c3

diff --git a/tier1/solid/src/solid/backends/wmi/wmiquery.cpp \
b/tier1/solid/src/solid/backends/wmi/wmiquery.cpp index 6727b76..a88a164 100644
--- a/tier1/solid/src/solid/backends/wmi/wmiquery.cpp
+++ b/tier1/solid/src/solid/backends/wmi/wmiquery.cpp
@@ -188,12 +188,14 @@ WmiQuery::Item::Item()
 
 WmiQuery::Item::Item(IWbemClassObject *p) : m_p(p)
 {
-    m_p->AddRef();
+    if(m_p != NULL)
+        m_p->AddRef();
 }
 
 WmiQuery::Item::Item(const Item& other) : m_p(other.m_p)
 {
-    m_p->AddRef();
+    if(m_p != NULL)
+        m_p->AddRef();
 }
 
 WmiQuery::Item& WmiQuery::Item::operator=(const Item& other)
@@ -218,7 +220,8 @@ WmiQuery::Item::~Item()
 
 IWbemClassObject* WmiQuery::Item::data() const
 {
-    m_p->AddRef();
+    if(m_p != NULL)
+        m_p->AddRef();
     return m_p;
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]