Merge pull request #177 from taks/fix-null-pointer-dereferences

Fix null pointer dereferences

Author: taks

src/client/ble_client.rs

@@ -415,9 +415,9 @@ impl BLEClient {
     }
 
     let error = unsafe { &*error };
-    let service = unsafe { &*service };
 
     if error.status == 0 {
+      let service = unsafe { &*service };
       // Found a service - add it to the vector
       let service = BLERemoteService::new(ArcUnsafeCell::downgrade(&client.state), service);
       client.state.services.as_mut().unwrap().push(service);

src/client/ble_remote_characteristic.rs

@@ -178,9 +178,9 @@ impl BLERemoteCharacteristic {
     }
 
     let error = unsafe { &*error };
-    let dsc = unsafe { &*dsc };
 
     if error.status == 0 {
+      let dsc = unsafe { &*dsc };
       let descriptor =
         BLERemoteDescriptor::new(ArcUnsafeCell::downgrade(&characteristic.state), dsc);
       characteristic

src/client/ble_remote_service.rs

@@ -92,9 +92,9 @@ impl BLERemoteService {
       return 0;
     }
     let error = unsafe { &*error };
-    let chr = unsafe { &*chr };
 
     if error.status == 0 {
+      let chr = unsafe { &*chr };
       let chr = BLERemoteCharacteristic::new(ArcUnsafeCell::downgrade(&service.state), chr);
       service.state.characteristics.as_mut().unwrap().push(chr);
       return 0;