X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fexport_image.c;h=bfeef97ad6b41afc83970afd6315f072e991c4d3;hp=56725e668bb77b113a4bf67fdd6b3c49476e051a;hb=cd433ce49f582175063141cc3673840bf321c453;hpb=5d3d469e410dc5f4a28814ad231336fc174cba56

diff --git a/src/export_image.c b/src/export_image.c
index 56725e66..bfeef97a 100644
--- a/src/export_image.c
+++ b/src/export_image.c
@@ -113,6 +113,11 @@ wimlib_export_image(WIMStruct *src_wim,
 	u32 orig_dest_image_count;
 
 	/* Check for sane parameters.  */
+	if (export_flags & ~(WIMLIB_EXPORT_FLAG_BOOT |
+			     WIMLIB_EXPORT_FLAG_NO_NAMES |
+			     WIMLIB_EXPORT_FLAG_NO_DESCRIPTIONS))
+		return WIMLIB_ERR_INVALID_PARAM;
+
 	if (src_wim == NULL || dest_wim == NULL)
 		return WIMLIB_ERR_INVALID_PARAM;
 
@@ -174,7 +179,7 @@ wimlib_export_image(WIMStruct *src_wim,
 		/* Determine destination image name and description.  */
 
 		if (export_flags & WIMLIB_EXPORT_FLAG_NO_NAMES) {
-			next_dest_name = NULL;
+			next_dest_name = T("");
 		} else if (dest_name) {
 			next_dest_name = dest_name;
 		} else {
@@ -185,8 +190,8 @@ wimlib_export_image(WIMStruct *src_wim,
 		DEBUG("Using name \"%"TS"\"", next_dest_name);
 
 		if (export_flags & WIMLIB_EXPORT_FLAG_NO_DESCRIPTIONS) {
-			next_dest_description = NULL;
-		} if (dest_description) {
+			next_dest_description = T("");
+		} else if (dest_description) {
 			next_dest_description = dest_description;
 		} else {
 			next_dest_description = wimlib_get_image_description(