Fix nil pointer dereference error (#126)

harryzcy · Jul 17, 2022 · 04368dc · 04368dc
1 parent 2f0b184
commit 04368dc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/api/emails/list/main.go b/api/emails/list/main.go
@@ -37,7 +37,7 @@ func handler(ctx context.Context, req events.APIGatewayV2HTTPRequest) (apiutil.R
 	order := req.QueryStringParameters["order"]
 	nextCursor := req.QueryStringParameters["nextCursor"]
 
-	var cursor email.Cursor
+	var cursor *email.Cursor
 	err = cursor.BindString(nextCursor)
 	if err != nil {
 		return apiutil.NewErrorResponse(http.StatusBadRequest, "invalid input"), nil
@@ -51,7 +51,7 @@ func handler(ctx context.Context, req events.APIGatewayV2HTTPRequest) (apiutil.R
 		Year:       year,
 		Month:      month,
 		Order:      order,
-		NextCursor: &cursor,
+		NextCursor: cursor,
 	})
 	if err != nil {
 		if err == email.ErrInvalidInput {

diff --git a/internal/email/list_cursor.go b/internal/email/list_cursor.go
@@ -70,6 +70,9 @@ func (c *Cursor) Bind(data []byte) error {
 	if len(data) == 0 {
 		return nil
 	}
+	if c == nil {
+		c = &Cursor{}
+	}
 
 	dst, err := decodeBase64Encoding(data)
 	if err != nil {