summaryrefslogtreecommitdiff
blob: 1c1e37ecf4b2fbeb43fe7d9e0b5492ac218b7885 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
Fix segfault when update is NULL

http://bugs.gentoo.org/119245
http://www.mail-archive.com/linux-raid@vger.kernel.org/msg03242.html

--- Assemble.c
+++ Assemble.c
@@ -219,7 +219,7 @@
 		}
 		if (dfd >= 0) close(dfd);
 
-		if (ident->uuid_set && (!update && strcmp(update, "uuid")!= 0) &&
+		if (ident->uuid_set && update && strcmp(update, "uuid")!= 0 &&
 		    (!super || same_uuid(info.uuid, ident->uuid, tst->ss->swapuuid)==0)) {
 			if ((inargv && verbose >= 0) || verbose > 0)
 				fprintf(stderr, Name ": %s has wrong uuid.\n",