Skip to content

SrtSocket.Close() leaks callbacks due to overwriting socket before map cleanup #78

Description

@ditogam

SrtSocket.Close() leaks callbacks due to overwriting socket before cleanup

Description
(*SrtSocket).Close() sets s.socket = SRT_INVALID_SOCK before attempting to clean up listenCallbackMap and connectCallbackMap.
Because the socket value is overwritten too early, the map lookups always fail. This results in:

  • gopointer.Unref never being called → memory leaks
  • map entries never being removed → map leaks

Current Code (buggy)

func (s *SrtSocket) Close() {
    C.srt_close(s.socket)
    s.socket = SRT_INVALID_SOCK
    if !s.blocking {
        s.pd.close()
    }
    callbackMutex.Lock()
    if ptr, exists := listenCallbackMap[s.socket]; exists {
        gopointer.Unref(ptr)
    }
    if ptr, exists := connectCallbackMap[s.socket]; exists {
        gopointer.Unref(ptr)
    }
    callbackMutex.Unlock()
}

Proposed Fix

func (s *SrtSocket) Close() {
    sock := s.socket
    if sock == SRT_INVALID_SOCK {
        return
    }

    callbackMutex.Lock()
    if ptr, ok := listenCallbackMap[sock]; ok {
        gopointer.Unref(ptr)
        delete(listenCallbackMap, sock)
    }
    if ptr, ok := connectCallbackMap[sock]; ok {
        gopointer.Unref(ptr)
        delete(connectCallbackMap, sock)
    }
    callbackMutex.Unlock()

    if !s.blocking && s.pd != nil {
        s.pd.close()
    }

    C.srt_close(sock)
    s.socket = SRT_INVALID_SOCK
}

Activity

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions