ddl, util/codec: fix add index OOM and prevent panic in logging (ping…

…cap#29925)
tangenta · Jan 12, 2022 · b17f421 · b17f421
1 parent dc07933
commit b17f421
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/ddl/backfilling.go b/ddl/backfilling.go
@@ -423,6 +423,13 @@ func (w *worker) handleReorgTasks(reorgInfo *reorgInfo, totalAddedCount *int64,
 }
 
 func tryDecodeToHandleString(key kv.Key) string {
+	defer func() {
+		if r := recover(); r != nil {
+			logutil.BgLogger().Warn("tryDecodeToHandleString panic",
+				zap.Any("recover()", r),
+				zap.Binary("key", key))
+		}
+	}()
 	handle, err := tablecodec.DecodeRowKey(key)
 	if err != nil {
 		recordPrefixIdx := bytes.Index(key, []byte("_r"))

diff --git a/tablecodec/tablecodec_test.go b/tablecodec/tablecodec_test.go
@@ -54,6 +54,20 @@ func (s *testTableCodecSuite) TestTableCodec(c *C) {
 	c.Assert(h.IntValue(), Equals, int64(2))
 }
 
+// https://github.com/pingcap/tidb/issues/27687.
+func TestTableCodecInvalid(t *testing.T) {
+	tableID := int64(100)
+	buf := make([]byte, 0, 11)
+	buf = append(buf, 't')
+	buf = codec.EncodeInt(buf, tableID)
+	buf = append(buf, '_', 'r')
+	buf = codec.EncodeInt(buf, -9078412423848787968)
+	buf = append(buf, '0')
+	_, err := DecodeRowKey(buf)
+	require.NotNil(t, err)
+	require.Equal(t, "invalid encoded key", err.Error())
+}
+
 // column is a structure used for test
 type column struct {
 	id int64

diff --git a/util/codec/codec.go b/util/codec/codec.go
@@ -958,7 +958,9 @@ func peek(b []byte) (length int, err error) {
 		return 0, errors.Trace(err)
 	}
 	length += l
-	if length > originLength {
+	if length <= 0 {
+		return 0, errors.New("invalid encoded key")
+	} else if length > originLength {
 		return 0, errors.Errorf("invalid encoded key, "+
 			"expected length: %d, actual length: %d", length, originLength)
 	}