2013-12-23 08:28:51

by Andrei Emeltchenko

Subject: [PATCH] android/tester: Fix possible NULL dereference

From: Andrei Emeltchenko <[email protected]>

value is checked for NULL and later is dereferenced if we do not return.
---
android/android-tester.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/android/android-tester.c b/android/android-tester.c
index 2d1ffde..0383115 100644
--- a/android/android-tester.c
+++ b/android/android-tester.c
@@ -148,18 +148,21 @@ static void test_device_property(bt_property_t *property,
if (value == NULL) {
tester_warn("NULL property passed");
tester_test_failed();
+ return;
}

if (property->type != type) {
tester_warn("Wrong remote property type %d, expected %d",
type, property->type);
tester_test_failed();
+ return;
}

if (property->len != len) {
tester_warn("Wrong remote property len %d, expected %d",
len, property->len);
tester_test_failed();
+ return;
}

if (memcmp(property->val, value, len)) {
--
1.8.3.2

2013-12-23 08:52:58

by Johan Hedberg

Subject: Re: [PATCH] android/tester: Fix possible NULL dereference

Hi Andrei,

On Mon, Dec 23, 2013, Andrei Emeltchenko wrote:
> value is checked for NULL and later is dereferenced if we do not return.
> ---
> android/android-tester.c | 3 +++
> 1 file changed, 3 insertions(+)

Applied. Thanks.

Johan