Merge pull request #9025 from tz-arm/mbed-os-5.11.0-oob_fix_fault_exception_issue

Cruz Monrreal · web-flow · commit 59ac1bb3fa7f · 2018-12-11T11:46:19.000-06:00
Mbed os 5.11.0 oob: fix fault exception issue
diff --git a/features/cellular/framework/AT/AT_CellularStack.cpp b/features/cellular/framework/AT/AT_CellularStack.cpp
@@ -307,7 +307,7 @@ nsapi_size_or_error_t AT_CellularStack::socket_recvfrom(nsapi_socket_t handle, S
 
         _at.unlock();
         if (ret_val != NSAPI_ERROR_OK) {
-            tr_error("Socket %d create %s error %d", find_socket_index(socket), addr->get_ip_address(), ret_val);
+            tr_error("Socket %d create error %d", find_socket_index(socket), ret_val);
             return ret_val;
         }
     }
@@ -319,7 +319,11 @@ nsapi_size_or_error_t AT_CellularStack::socket_recvfrom(nsapi_socket_t handle, S
     _at.unlock();
 
     if (ret_val >= 0) {
-        tr_info("Socket %d recv %d bytes from %s port %d", find_socket_index(socket), ret_val, addr->get_ip_address(), addr->get_port());
+        if (addr) {
+            tr_info("Socket %d recv %d bytes from %s port %d", find_socket_index(socket), ret_val, addr->get_ip_address(), addr->get_port());
+        } else {
+            tr_info("Socket %d recv %d bytes", find_socket_index(socket), ret_val);
+        }
     } else if (ret_val != NSAPI_ERROR_WOULD_BLOCK) {
         tr_error("Socket %d recv error %d", find_socket_index(socket), ret_val);
     }

Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,7 @@ nsapi_size_or_error_t AT_CellularStack::socket_recvfrom(nsapi_socket_t handle, S`
`307`	`307`
`308`	`308`	`_at.unlock();`
`309`	`309`	`if (ret_val != NSAPI_ERROR_OK) {`
`310`		`- tr_error("Socket %d create %s error %d", find_socket_index(socket), addr->get_ip_address(), ret_val);`
	`310`	`+ tr_error("Socket %d create error %d", find_socket_index(socket), ret_val);`
`311`	`311`	`return ret_val;`
`312`	`312`	`}`
`313`	`313`	`}`
`@@ -319,7 +319,11 @@ nsapi_size_or_error_t AT_CellularStack::socket_recvfrom(nsapi_socket_t handle, S`
`319`	`319`	`_at.unlock();`
`320`	`320`
`321`	`321`	`if (ret_val >= 0) {`
`322`		`- tr_info("Socket %d recv %d bytes from %s port %d", find_socket_index(socket), ret_val, addr->get_ip_address(), addr->get_port());`
	`322`	`+ if (addr) {`
	`323`	`+ tr_info("Socket %d recv %d bytes from %s port %d", find_socket_index(socket), ret_val, addr->get_ip_address(), addr->get_port());`
	`324`	`+ } else {`
	`325`	`+ tr_info("Socket %d recv %d bytes", find_socket_index(socket), ret_val);`
	`326`	`+ }`
`323`	`327`	`} else if (ret_val != NSAPI_ERROR_WOULD_BLOCK) {`
`324`	`328`	`tr_error("Socket %d recv error %d", find_socket_index(socket), ret_val);`
`325`	`329`	`}`