akkartik/sokoban.love - Change MP2TBKU6CNDMZKENYMBV62F5KQ27ZWEVPVRFS2RESVDQQT2IRR4AC

bugfix: crash in Text.up() after return

Let's just make all the utf8.offset calculations more defensive.

Created by Kartik K. Agaram on June 19, 2022

MP2TBKU6CNDMZKENYMBV62F5KQ27ZWEVPVRFS2RESVDQQT2IRR4AC

Dependencies

In channels

main

Change contents

Replacement in text.lua at line 116 [6.1]

B:BD[4.910] → [4.910:1010]

          local boffset = utf8.offset(frag, bpos+1)  -- byte _after_ bpos
          assert(boffset)

[4.910]

[4.1010]

          local boffset = Text.offset(frag, bpos+1)  -- byte _after_ bpos

Replacement in text.lua at line 158 [6.1]
∅:D[7.51] → [8.171:191]
∅:D[9.55] → [8.171:191]
∅:D[10.99] → [8.171:191]
∅:D[3.118] → [8.171:191]
∅:D[11.6357] → [8.171:191]
B:BD[8.171] → [8.171:191]
B:BD[8.191] → [12.459:485]
B:BD[12.485] → [9.56:125]
∅:D[9.125] → [8.285:292]
∅:D[12.556] → [8.285:292]
B:BD[8.285] → [8.285:292]
B:BD[8.292] → [9.126:146]
∅:D[9.146] → [8.312:318]
B:BD[8.312] → [8.312:318]
B:BD[8.318] → [3.119:248]
```
  local byte_offset
  if Cursor1.pos > 1 then
    byte_offset = utf8.offset(Lines[Cursor1.line].data, Cursor1.pos)
  else
    byte_offset = 1
  end
  if byte_offset == nil then
    print(Cursor1.line, Cursor1.pos, byte_offset, Lines[Cursor1.line].data)
    assert(false)
  end
```
[10.99]
[9.147]
```
  local byte_offset = Text.offset(Lines[Cursor1.line].data, Cursor1.pos)
```
Replacement in text.lua at line 167 [6.1]
B:BD[8.627] → [13.8375:8394]
```
--?   print(chord)
```
[8.627]
[14.1]
```
--?   print('chord')
```

Replacement in text.lua at line 373 [6.1]

B:BD[15.223] → [15.223:296]

B:BD[15.296] → [16.1167:1293]

  local byte_offset = utf8.offset(Lines[Cursor1.line].data, Cursor1.pos)
--?   print(Cursor1.line, Cursor1.pos, #Lines[Cursor1.line].data)
--?   print(Lines[Cursor1.line].data)
  assert(byte_offset)

[15.223]

[15.296]

  local byte_offset = Text.offset(Lines[Cursor1.line].data, Cursor1.pos)

Replacement in text.lua at line 455 [6.1]

B:BD[17.1520] → [5.3:165]

        local screen_line_starting_byte_offset = utf8.offset(Lines[Cursor1.line].data, screen_line_starting_pos)
        assert(screen_line_starting_byte_offset)

[17.1520]

[5.165]

        local screen_line_starting_byte_offset = Text.offset(Lines[Cursor1.line].data, screen_line_starting_pos)

Replacement in text.lua at line 474 [6.1]

B:BD[17.2441] → [5.255:421]

    local new_screen_line_starting_byte_offset = utf8.offset(Lines[Cursor1.line].data, new_screen_line_starting_pos)
    assert(new_screen_line_starting_byte_offset)

[17.2441]

[5.421]

    local new_screen_line_starting_byte_offset = Text.offset(Lines[Cursor1.line].data, new_screen_line_starting_pos)

Replacement in text.lua at line 513 [6.1]

B:BD[17.4338] → [5.511:677]

    local new_screen_line_starting_byte_offset = utf8.offset(Lines[Cursor1.line].data, new_screen_line_starting_pos)
    assert(new_screen_line_starting_byte_offset)

[17.4338]

[5.677]

    local new_screen_line_starting_byte_offset = Text.offset(Lines[Cursor1.line].data, new_screen_line_starting_pos)

Replacement in text.lua at line 531 [6.1]

B:BD[17.5061] → [17.5061:5131]

    local offset = utf8.offset(Lines[Cursor1.line].data, Cursor1.pos)

[17.5061]

[17.5131]

    local offset = Text.offset(Lines[Cursor1.line].data, Cursor1.pos)

Replacement in text.lua at line 543 [6.1]

B:BD[17.5383] → [17.5383:5453]

    local offset = utf8.offset(Lines[Cursor1.line].data, Cursor1.pos)

[17.5383]

[13.10688]

    local offset = Text.offset(Lines[Cursor1.line].data, Cursor1.pos)

Replacement in text.lua at line 683 [6.1]

B:BD[18.133] → [5.767:910]

      local screen_line_starting_byte_offset = utf8.offset(line.data, screen_line_starting_pos)
      assert(screen_line_starting_byte_offset)

[18.133]

[5.910]

      local screen_line_starting_byte_offset = Text.offset(line.data, screen_line_starting_pos)

Replacement in text.lua at line 788 [6.1]

B:BD[19.360] → [19.360:414]

  local offset = utf8.offset(s, pos)
  assert(offset)

[19.360]

[19.414]

  local offset = Text.offset(s, pos)

Insertion in text.lua at line 842 [6.1]

[20.559]

end
function Text.offset(s, pos1)
  if pos1 == 1 then return 1 end
  local result = utf8.offset(s, pos1)
  if result == nil then
    print(Cursor1.line, Cursor1.pos, #Lines[Cursor1.line].data, Lines[Cursor1.line].data)
    print(pos1, #s, s)
  end
  assert(result)
  return result

Replacement in select.lua at line 58 [21.43980]

B:BD[2.242] → [2.242:391]

    local lo_offset = utf8.offset(line.data, lo)
    local hi_offset = utf8.offset(line.data, hi)
    local pos_offset = utf8.offset(line.data, pos)

[2.242]

[2.391]

    local lo_offset = Text.offset(line.data, lo)
    local hi_offset = Text.offset(line.data, hi)
    local pos_offset = Text.offset(line.data, pos)

Replacement in select.lua at line 140 [21.43980]

B:BD[21.47373] → [21.47373:47487]

  local min_offset = utf8.offset(Lines[minl].data, minp)
  local max_offset = utf8.offset(Lines[maxl].data, maxp)

[21.47373]

[21.47487]

  local min_offset = Text.offset(Lines[minl].data, minp)
  local max_offset = Text.offset(Lines[maxl].data, maxp)

Replacement in select.lua at line 168 [21.43980]

B:BD[21.48224] → [21.48224:48338]

  local min_offset = utf8.offset(Lines[minl].data, minp)
  local max_offset = utf8.offset(Lines[maxl].data, maxp)

[21.48224]

[21.48338]

  local min_offset = Text.offset(Lines[minl].data, minp)
  local max_offset = Text.offset(Lines[maxl].data, maxp)

Replacement in main.lua at line 425 [23.2]

B:BD[22.3421] → [22.3421:3477]

      local byte_offset = utf8.offset(Search_term, len)

[22.3421]

[22.3477]

      local byte_offset = Text.offset(Search_term, len)

Replacement in main.lua at line 540 [23.2]

B:BD[24.782] → [24.782:837]

        local byte_offset = utf8.offset(p.name, len-1)

[24.782]

[24.837]

        local byte_offset = Text.offset(p.name, len-1)