Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix fuzzer extract message error #3899

Merged
merged 1 commit into from Jun 13, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
fix fuzzer extract message error
Signed-off-by: vincentgoat <linguohui1@huawei.com>
  • Loading branch information
vincentgoat committed Jun 9, 2022
commit 5d60ae9eabd6b6b7afe38758e19bbe8137664701
10 changes: 4 additions & 6 deletions cloud/pkg/cloudhub/servers/udsserver/server.go
Expand Up @@ -50,17 +50,15 @@ func StartServer(address string) {

// ExtractMessage extracts message from clients
func ExtractMessage(context string) (*model.Message, error) {
var msg model.Message
if context == "" {
return nil, errors.New("failed with error: context is empty")
return &msg, errors.New("failed with error: context is empty")
}

var msg *model.Message
err := json.Unmarshal([]byte(context), &msg)
if err != nil {
return nil, err
return &msg, err
}

return msg, nil
return &msg, nil
}

// feedbackError sends back error message
Expand Down
4 changes: 2 additions & 2 deletions cloud/pkg/csidriver/utils.go
Expand Up @@ -167,7 +167,7 @@ func sendToKubeEdge(context, kubeEdgeEndpoint string) (string, error) {

// extractMessage extracts message
func extractMessage(context string) (*model.Message, error) {
var msg *model.Message
var msg model.Message
if context == "" {
err := errors.New("failed to extract message with empty context")
klog.Errorf("%v", err)
Expand All @@ -179,5 +179,5 @@ func extractMessage(context string) (*model.Message, error) {
return nil, err
}

return msg, nil
return &msg, nil
}
8 changes: 4 additions & 4 deletions edge/pkg/metamanager/client/node.go
Expand Up @@ -85,19 +85,19 @@ func handleNodeFromMetaDB(content []byte) (*api.Node, error) {
return nil, fmt.Errorf("node length from meta db is %d", len(lists))
}

var node *api.Node
var node api.Node
err = json.Unmarshal([]byte(lists[0]), &node)
if err != nil {
return nil, fmt.Errorf("unmarshal message to node from db failed, err: %v", err)
}
return node, nil
return &node, nil
}

func handleNodeFromMetaManager(content []byte) (*api.Node, error) {
var node *api.Node
var node api.Node
err := json.Unmarshal(content, &node)
if err != nil {
return nil, fmt.Errorf("unmarshal message to node failed, err: %v", err)
}
return node, nil
return &node, nil
}
4 changes: 2 additions & 2 deletions edge/pkg/metamanager/client/persistentvolume.go
Expand Up @@ -89,10 +89,10 @@ func handlePersistentVolumeFromMetaDB(content []byte) (*api.PersistentVolume, er
}

func handlePersistentVolumeFromMetaManager(content []byte) (*api.PersistentVolume, error) {
var pv *api.PersistentVolume
var pv api.PersistentVolume
err := json.Unmarshal(content, &pv)
if err != nil {
return nil, fmt.Errorf("unmarshal message to persistentvolume failed, err: %v", err)
}
return pv, nil
return &pv, nil
}
8 changes: 4 additions & 4 deletions edge/pkg/metamanager/client/persistentvolumeclaim.go
Expand Up @@ -80,19 +80,19 @@ func handlePersistentVolumeClaimFromMetaDB(content []byte) (*api.PersistentVolum
return nil, fmt.Errorf("persistentvolumeclaim length from meta db is %d", len(lists))
}

var pvc *api.PersistentVolumeClaim
var pvc api.PersistentVolumeClaim
err = json.Unmarshal([]byte(lists[0]), &pvc)
if err != nil {
return nil, fmt.Errorf("unmarshal message to persistentvolumeclaim from db failed, err: %v", err)
}
return pvc, nil
return &pvc, nil
}

func handlePersistentVolumeClaimFromMetaManager(content []byte) (*api.PersistentVolumeClaim, error) {
var pvc *api.PersistentVolumeClaim
var pvc api.PersistentVolumeClaim
err := json.Unmarshal(content, &pvc)
if err != nil {
return nil, fmt.Errorf("unmarshal message to persistentvolumeclaim failed, err: %v", err)
}
return pvc, nil
return &pvc, nil
}
8 changes: 4 additions & 4 deletions edge/pkg/metamanager/client/volumeattachment.go
Expand Up @@ -92,19 +92,19 @@ func handleVolumeAttachmentFromMetaDB(content []byte) (*api.VolumeAttachment, er
return nil, fmt.Errorf("volumeattachment length from meta db is %d", len(lists))
}

var va *api.VolumeAttachment
var va api.VolumeAttachment
err = json.Unmarshal([]byte(lists[0]), &va)
if err != nil {
return nil, fmt.Errorf("unmarshal message to volumeattachment from db failed, err: %v", err)
}
return va, nil
return &va, nil
}

func handleVolumeAttachmentFromMetaManager(content []byte) (*api.VolumeAttachment, error) {
var va *api.VolumeAttachment
var va api.VolumeAttachment
err := json.Unmarshal(content, &va)
if err != nil {
return nil, fmt.Errorf("unmarshal message to volumeattachment failed, err: %v", err)
}
return va, nil
return &va, nil
}