浏览代码

Merge pull request #41626 from cuonglm/master

pkg/devicemapper: fix invalid usage of reflect.SliceHeader
Sebastiaan van Stijn 4 年之前
父节点
当前提交
be67385209
共有 1 个文件被更改,包括 5 次插入6 次删除
  1. 5 6
      pkg/devicemapper/devmapper_wrapper.go

+ 5 - 6
pkg/devicemapper/devmapper_wrapper.go

@@ -150,12 +150,11 @@ func dmTaskGetDepsFct(task *cdmTask) *Deps {
 	}
 
 	// golang issue: https://github.com/golang/go/issues/11925
-	hdr := reflect.SliceHeader{
-		Data: uintptr(unsafe.Pointer(uintptr(unsafe.Pointer(Cdeps)) + unsafe.Sizeof(*Cdeps))),
-		Len:  int(Cdeps.count),
-		Cap:  int(Cdeps.count),
-	}
-	devices := *(*[]C.uint64_t)(unsafe.Pointer(&hdr))
+	var devices []C.uint64_t
+	devicesHdr := (*reflect.SliceHeader)(unsafe.Pointer(&devices))
+	devicesHdr.Data = uintptr(unsafe.Pointer(uintptr(unsafe.Pointer(Cdeps)) + unsafe.Sizeof(*Cdeps)))
+	devicesHdr.Len = int(Cdeps.count)
+	devicesHdr.Cap = int(Cdeps.count)
 
 	deps := &Deps{
 		Count:  uint32(Cdeps.count),