commit 98e5e68ee33367f82547a61d69041f5369d348bc
author Linux Build Service Account <lnxbuild@localhost> Thu Jul 31 06:00:56 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Jul 31 06:00:56 2014 -0700
tree 75f71a297a9bfa8424a3372ff031f5cf73200315
parent d3953962bf192254aca59343e6b447a9829ec176
parent ae0927b6ac502e5b645948032e78ce102ce0e91b

Merge "platform: msm_shared: check if valp is NULL before using it."

platform/msm_shared/dev_tree.c

diff --git a/platform/msm_shared/dev_tree.c b/platform/msm_shared/dev_tree.c
index e4505d4..b139cf2 100644
--- a/platform/msm_shared/dev_tree.c
+++ b/platform/msm_shared/dev_tree.c
@@ -623,7 +623,7 @@
 
 	/* Find the #address-cells size. */
 	valp = (uint32_t*)fdt_getprop(fdt, offset, "#address-cells", &len);
-	if (len <= 0)
+	if (len <= 0 || !valp)
 	{
 		if (len == -FDT_ERR_NOTFOUND)
 		{
@@ -644,7 +644,7 @@
 
 	/* Find the #size-cells size. */
 	valp = (uint32_t*)fdt_getprop(fdt, offset, "#size-cells", &len);
-	if (len <= 0)
+	if (len <= 0 || !valp)
 	{
 		if (len == -FDT_ERR_NOTFOUND)
 		{