| commit | dd0a6cdf1f88fcbe16070f678911702c81c4fd4a | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Sat Apr 06 12:51:36 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Apr 06 12:51:36 2013 -0700 |
| tree | 3ca0739ce2dd8aab11d215d28299de0b581ec578 | |
| parent | d3859e433d5a4e0da3f24851c5f5f6c9c8b97849 [diff] | |
| parent | 578b74734c1cfc773f3213a23a7195aa4b5b97aa [diff] |
am 578b7473: Merge "libsparse: Fix null pointer issue" * commit '578b74734c1cfc773f3213a23a7195aa4b5b97aa': libsparse: Fix null pointer issue
diff --git a/libsparse/output_file.c b/libsparse/output_file.c index b5ae419..5014e4a 100644 --- a/libsparse/output_file.c +++ b/libsparse/output_file.c
@@ -675,6 +675,9 @@ } else { out = output_file_new_normal(); } + if (!out) { + return NULL; + } out->ops->open(out, fd);