diff options
author | Dmitry Shmidt <dimitrysh@google.com> | 2009-11-11 17:31:27 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-11 17:31:27 -0800 |
commit | 899d317e4055907075c6adf713bf9d1fe500c5f1 (patch) | |
tree | 8ede5411abba2e18a3b5c5253e959bdfae865ad7 | |
parent | 40d9006ebd853877a89878b3592b0f3d42906abb (diff) | |
parent | be5cce4a3dc21ccdeaaa510cb01fdcff5f6716cc (diff) | |
download | wpa_supplicant-899d317e4055907075c6adf713bf9d1fe500c5f1.tar.gz |
am be5cce4a: Check if interface is valid in wpa_ctrl_close()
Merge commit 'be5cce4a3dc21ccdeaaa510cb01fdcff5f6716cc' into eclair-mr2-plus-aosp
* commit 'be5cce4a3dc21ccdeaaa510cb01fdcff5f6716cc':
Check if interface is valid in wpa_ctrl_close()
-rw-r--r-- | wpa_ctrl.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -140,8 +140,11 @@ struct wpa_ctrl * wpa_ctrl_open(const char *ctrl_path) void wpa_ctrl_close(struct wpa_ctrl *ctrl) { + if (ctrl == NULL) + return; unlink(ctrl->local.sun_path); - close(ctrl->s); + if (ctrl->s >= 0) + close(ctrl->s); os_free(ctrl); } |