greatape
/
goldgorilla
5
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

fix nil pointer #2

Open
benyamin wants to merge 1 commits from fix/nilpointer_ggid into master
pull from: fix/nilpointer_ggid
merge into: greatape:master
Conversation 0 Commits 1 Files Changed 2
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
controllers/room.go
View File

@ -89,6 +89,10 @@ func (c *RoomController) Offer(ctx *gin.Context) {
c.helper.Response(ctx, struct{}{}, http.StatusNoContent) c.helper.Response(ctx, struct{}{}, http.StatusNoContent)
{ {
ggid := c.repo.GetRoomGGID(reqModel.RoomId) ggid := c.repo.GetRoomGGID(reqModel.RoomId)
if ggid == nil {
println("ggid is nil, not answering for offer")
return
}
buffer, err := json.Marshal(dto.SetSDPReqModel{ buffer, err := json.Marshal(dto.SetSDPReqModel{
PeerDTO: dto.PeerDTO{ PeerDTO: dto.PeerDTO{
RoomId: reqModel.RoomId, RoomId: reqModel.RoomId,

5
repositories/room.go
View File

@ -556,6 +556,11 @@ func (r *RoomRepository) offerPeer(peer *Peer, roomId string) error {
return err return err
} }
ggid := r.GetRoomGGID(roomId) ggid := r.GetRoomGGID(roomId)
if ggid == nil {
println("[PC] ok not negotiating with peer", peer.ID, "(room is deleted)")
peer.HandshakeLock.Unlock()
return errors.New("room doesnt have ggid")
}
reqModel := dto.SetSDPReqModel{ reqModel := dto.SetSDPReqModel{
GGID: *ggid, GGID: *ggid,
PeerDTO: dto.PeerDTO{ PeerDTO: dto.PeerDTO{