Ensure result sets in all query conditions. (4c843b5d) · Commits · public-projects / Nakama

server/core_authenticate.go

+4 −1

Original line number	Diff line number	Diff line
		@@ -626,6 +626,7 @@ func importFacebookFriends(logger zap.Logger, db sql.DB, messageRouter Message
		}
		return err
		}
		defer rows.Close()

		var id string
		for rows.Next() {
		@@ -637,9 +638,11 @@ func importFacebookFriends(logger zap.Logger, db sql.DB, messageRouter Message
		}
		friendID := uuid.FromStringOrNil(id)

		_, err = tx.Query("SELECT state FROM user_edge WHERE source_id = $1 AND destination_id = $2 AND state = 3", userID, friendID)
		var r *sql.Rows
		r, err = tx.Query("SELECT state FROM user_edge WHERE source_id = $1 AND destination_id = $2 AND state = 3", userID, friendID)
		if err == nil {
		// User has previously blocked this friend, skip it.
		r.Close()
		continue
		} else if err != sql.ErrNoRows {
		logger.Error("Error checking block status in Facebook friend import.", zap.Error(err))

+3 −0

Original line number	Diff line number	Diff line
		@@ -113,6 +113,7 @@ RETURNING id, creator_id, name, description, avatar_url, state, edge_count, lang
		logger.Debug("Could not create group.", zap.Error(err))
		return err
		}
		// Rows closed in groupConvertRows()

		groups, err := groupConvertRows(rows)
		if err != nil {
		@@ -292,6 +293,7 @@ WHERE (id = $1) AND (disable_time::INT = 0)`
		logger.Error("Could not look up group while trying to join it.", zap.Error(err))
		return err
		}
		// Rows closed in groupConvertRows()

		groups, err := groupConvertRows(rows)
		if err != nil {
		@@ -940,6 +942,7 @@ LIMIT $1`
		logger.Error("Could not list groups.", zap.Error(err), zap.String("name", name))
		return nil, err
		}
		// Rows closed in groupConvertRows()

		groups, err := groupConvertRows(rows)
		if err != nil {

+1 −0

Original line number	Diff line number	Diff line
		@@ -105,6 +105,7 @@ ORDER BY create_time ASC`+limitQuery, params...)
		logger.Error("Could not retrieve notifications.", zap.Error(err))
		return nil, err
		}
		defer rows.Close()

		notifications := make([]*api.Notification, 0)
		for rows.Next() {

+4 −2

Original line number	Diff line number	Diff line
		@@ -101,6 +101,7 @@ LIMIT $2`
		return nil, err
		}
		}
		defer rows.Close()

		objects, err := storageListObjects(rows, cursor)
		if err != nil {
		@@ -133,6 +134,7 @@ LIMIT $3`
		return nil, err
		}
		}
		defer rows.Close()

		objects, err := storageListObjects(rows, cursor)
		if err != nil {
		@@ -173,8 +175,8 @@ LIMIT $3`
		return nil, err
		}
		}

		defer rows.Close()

		objects, err := storageListObjects(rows, cursor)
		if err != nil {
		logger.Error("Could not list storage.", zap.Error(err), zap.String("collection", collection), zap.Int("limit", limit), zap.String("cursor", cursor))
		@@ -198,8 +200,8 @@ WHERE user_id = $1`
		return nil, err
		}
		}

		defer rows.Close()

		objects := make([]*api.StorageObject, 0)
		for rows.Next() {
		o := &api.StorageObject{CreateTime: &timestamp.Timestamp{}, UpdateTime: &timestamp.Timestamp{}}