Explorar el Código

Merge pull request #34146 from kolyshkin/vasprintf

devmapper_wrapper.go: fix gcc warning
Brian Goff hace 8 años
padre
commit
72959fc216
Se han modificado 1 ficheros con 6 adiciones y 1 borrados
  1. 6 1
      pkg/devicemapper/devmapper_wrapper.go

+ 6 - 1
pkg/devicemapper/devmapper_wrapper.go

@@ -15,10 +15,15 @@ static void	log_cb(int level, const char *file, int line, int dm_errno_or_class,
 {
 {
 	char *buffer = NULL;
 	char *buffer = NULL;
 	va_list ap;
 	va_list ap;
+	int ret;
 
 
 	va_start(ap, f);
 	va_start(ap, f);
-	vasprintf(&buffer, f, ap);
+	ret = vasprintf(&buffer, f, ap);
 	va_end(ap);
 	va_end(ap);
+	if (ret < 0) {
+		// memory allocation failed -- should never happen?
+		return;
+	}
 
 
 	DevmapperLogCallback(level, (char *)file, line, dm_errno_or_class, buffer);
 	DevmapperLogCallback(level, (char *)file, line, dm_errno_or_class, buffer);
 	free(buffer);
 	free(buffer);