INET: Fix a potential memory leak

rsmarples · rsmarples · commit f7e2c244a90c · 2019-10-23T11:21:38.000+01:00
When someone deletes the address from under us.
diff --git a/src/dhcp.c b/src/dhcp.c
@@ -4008,7 +4008,7 @@ dhcp_handleifa(int cmd, struct ipv4_addr *ia, pid_t pid)
 			 * to drop the lease. */
 			dhcp_drop(ifp, "EXPIRE");
 			dhcp_start1(ifp);
-			return NULL;
+			return ia;
 		}
 	}
 
diff --git a/src/ipv4.c b/src/ipv4.c
@@ -942,7 +942,7 @@ ipv4_handleifa(struct dhcpcd_ctx *ctx,
 #endif
 	}
 
-	if (cmd == RTM_DELADDR && ia != NULL)
+	if (cmd == RTM_DELADDR)
 		free(ia);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -4008,7 +4008,7 @@ dhcp_handleifa(int cmd, struct ipv4_addr *ia, pid_t pid)`
`4008`	`4008`	`* to drop the lease. */`
`4009`	`4009`	`dhcp_drop(ifp, "EXPIRE");`
`4010`	`4010`	`dhcp_start1(ifp);`
`4011`		`- return NULL;`
	`4011`	`+ return ia;`
`4012`	`4012`	`}`
`4013`	`4013`	`}`
`4014`	`4014`
Original file line number	Diff line number	Diff line change
`@@ -942,7 +942,7 @@ ipv4_handleifa(struct dhcpcd_ctx *ctx,`
`942`	`942`	`#endif`
`943`	`943`	`}`
`944`	`944`
`945`		`- if (cmd == RTM_DELADDR && ia != NULL)`
	`945`	`+ if (cmd == RTM_DELADDR)`
`946`	`946`	`free(ia);`
`947`	`947`	`}`
`948`	`948`