git://wimlib.net
/
wimlib
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
655c1ad
)
build_Dentry_tree(): Make sure capture config gets destroyed
author
Eric Biggers
<ebiggers3@gmail.com>
Sun, 17 Mar 2013 02:16:54 +0000
(21:16 -0500)
committer
Eric Biggers
<ebiggers3@gmail.com>
Sun, 17 Mar 2013 02:16:54 +0000
(21:16 -0500)
src/add_image.c
patch
|
blob
|
history
diff --git
a/src/add_image.c
b/src/add_image.c
index 0ae57361af3f5822137af62e4eca2d978e1a86b9..ed8bae23d2a86e36774a1ed19e3c92f4847a2ec2 100644
(file)
--- a/
src/add_image.c
+++ b/
src/add_image.c
@@
-848,7
+848,7
@@
static int build_dentry_tree(struct wim_dentry **root_ret,
ret = utf8_to_utf16(root_disk_path, strlen(root_disk_path),
(char**)&path_utf16, &path_utf16_nchars);
if (ret)
ret = utf8_to_utf16(root_disk_path, strlen(root_disk_path),
(char**)&path_utf16, &path_utf16_nchars);
if (ret)
- goto out;
+ goto out
_destroy_sd_set
;
path_utf16_nchars /= sizeof(wchar_t);
HANDLE hFile = win32_open_file_readonly(path_utf16);
path_utf16_nchars /= sizeof(wchar_t);
HANDLE hFile = win32_open_file_readonly(path_utf16);
@@
-857,7
+857,7
@@
static int build_dentry_tree(struct wim_dentry **root_ret,
ERROR("Win32 API: Failed to open \"%s\"", root_disk_path);
win32_error(err);
ret = WIMLIB_ERR_OPEN;
ERROR("Win32 API: Failed to open \"%s\"", root_disk_path);
win32_error(err);
ret = WIMLIB_ERR_OPEN;
- goto out_
destroy_sd_set
;
+ goto out_
free_path_utf16
;
}
BY_HANDLE_FILE_INFORMATION file_info;
}
BY_HANDLE_FILE_INFORMATION file_info;
@@
-1628,7
+1628,7
@@
WIMLIBAPI int wimlib_add_image_multisource(WIMStruct *w,
if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_BOOT)
wimlib_set_boot_idx(w, w->hdr.image_count);
ret = 0;
if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_BOOT)
wimlib_set_boot_idx(w, w->hdr.image_count);
ret = 0;
- goto out;
+ goto out
_destroy_capture_config
;
out_destroy_imd:
destroy_image_metadata(&w->image_metadata[w->hdr.image_count - 1],
w->lookup_table);
out_destroy_imd:
destroy_image_metadata(&w->image_metadata[w->hdr.image_count - 1],
w->lookup_table);