Skip to content

[RFC] shada: Make sure that code does not attempt to read too long items #6958

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 2 commits into from
Jul 4, 2017
Merged

[RFC] shada: Make sure that code does not attempt to read too long items #6958

merged 2 commits into from
Jul 4, 2017

Conversation

ZyX-I
Copy link
Contributor

@ZyX-I ZyX-I commented Jul 4, 2017

Fixes #6957

@ZyX-I
Copy link
Contributor Author

ZyX-I commented Jul 4, 2017

AppVeyor failure is usual

[  FAILED  ] C:/projects/neovim/test/functional\core\job_spec.lua @ 267: jobs can pass user data to the callback
C:/projects/neovim/test/functional\core\job_spec.lua:271: Expected objects to be the same.
Passed in:
(table) {
  [1] = 'notification'
  [2] = 'stdout'
 *[3] = {
    [1] = {
      [l] = { ... more }
      [n] = 5
      [s] = 'str' }
   *[2] = {
      [1] = 'foo' } } }
Expected:
(table) {
  [1] = 'notification'
  [2] = 'stdout'
 *[3] = {
    [1] = {
      [l] = { ... more }
      [n] = 5
      [s] = 'str' }
   *[2] = {
      [1] = 'foo'
     *[2] = '' } } }
stack traceback:
	C:/projects/neovim/test/functional\core\job_spec.lua:271: in function <C:/projects/neovim/test/functional\core\job_spec.lua:267>

QB only failed to compile due to kbtree.

Travis hang on check-single-includes, restarting.

@ZyX-I ZyX-I changed the title shada: Make sure that code does not attempt to read too long items [RFC] shada: Make sure that code does not attempt to read too long items Jul 4, 2017
@ZyX-I
Copy link
Contributor Author

ZyX-I commented Jul 4, 2017

After restart lint stage succeeded, PR should be ready now.

@marvim marvim added the RFC label Jul 4, 2017
justinmk
justinmk reviewed Jul 4, 2017
View reviewed changes
src/nvim/shada.c
if (length_u64 > PTRDIFF_MAX) {
emsgf(_(RCERR "Error while reading ShaDa file: "
"there is an item at position %" PRIu64 " "
"that is stated to be too long"),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why "is stated to be" instead of just "is"? Could be abbreviated without ambiguity:

emsgf(_(RCERR "Error while reading ShaDa file: "
        "item at position %" PRIu64 " is too long"),

Copy link
Contributor Author

@ZyX-I ZyX-I Jul 4, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@justinmk Because it is “stated to be”, you can’t generate such long entry under normal circumstances so most likely the number is wrong for one reason or another (starting from fuzzing output like in the original issue and ending with corrupted FS or trying to use non-ShaDa file).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok. Could be reworded, but not worth it if this should never happen.

@justinmk justinmk merged commit 1b70a1d into neovim:master Jul 4, 2017
@justinmk justinmk removed the RFC label Jul 4, 2017
@ZyX-I ZyX-I deleted the fix-6957 branch July 4, 2017 19:56
justinmk added a commit to justinmk/neovim that referenced this pull request Nov 8, 2017
@justinmk
NVIM v0.2.1
c67dd5a 
FEATURES:
0e873a3 Lua(Jit) built-in neovim#4411
5b32bce Windows: `:terminal` neovim#7007
7b0ceb3 UI/API: externalize cmdline neovim#7173
b67f58b UI/API: externalize wildmenu neovim#7454
b23aa1c UI: 'winhighlight' neovim#6597
17531ed UI: command-line coloring (`:help input()-highlight`) neovim#6364
244a1f9 API: execute lua directly from the remote api neovim#6704
45626de API: `get_keymap()` neovim#6236
db99982 API: `nvim_get_hl_by_name()`, `nvim_get_hl_by_id()` neovim#7082
dc68538 menu_get() function neovim#6322
9db42d4 :cquit : take an error code argument neovim#7336
9cc185d job-control: serverstart(): support ipv6 neovim#6680
1b7a9bf job-control: sockopen() neovim#6594
6efe84a clipboard: fallback to tmux clipboard neovim#6894
6016ac2 clipboard: customize clipboard with `g:clipboard` neovim#6030
3a86dd5 ruby: override ruby host via `g:ruby_host_prog` neovim#6841
16cce1a debug: $NVIM_LOG_FILE neovim#6827
0cba3da `:checkhealth` built-in, validates $VIMRUNTIME neovim#7399

FIXES:
105d680 TUI: more terminals, improve scroll/resize neovim#6816
cb912a3 :terminal : handle F1-F12, other keys neovim#7241
619838f inccommand: improve performance neovim#6949
04b3c32 inccommand: Fix matches for zero-width neovim#7487
60b1e8a inccommand: multiline, other fixes neovim#7315
f1f7f3b inccommand: Ignore leading modifiers in the command neovim#6967
1551f71 inccommand: fix 'gdefault' lockup neovim#7262
6338199 API: bufhl: support creating new groups neovim#7414
541dde3 API: allow K_EVENT during operator-pending
8c732f7 terminal: adjust for 'number' neovim#7440
5bec946 UI: preserve wildmenu during jobs/events neovim#7110
c349083 UI: disable 'lazyredraw' during ui_refresh. neovim#6259
51808a2 send FocusGained/FocusLost event instead of pseudokey neovim#7221
133f8bc shada: preserve unnamed register on restart neovim#4700
1b70a1d shada: avoid assertion on corrupt shada file neovim#6958
9f534f3 mksession: Restore tab-local working directory neovim#6859
de1084f fix buf_write() crash neovim#7140
7f76986 syntax: register 'Normal' highlight group neovim#6973
6e7a8c3 RPC: close channel if stream was closed neovim#7081
85f3084 clipboard: disallow recursion; show hint only once neovim#7203
8d1ccb6 clipboard: performance, avoid weird edge-cases neovim#7193
01487d4 'titleold' neovim#7358
01e53a5 Windows: better path-handling, separator (slash) hygiene neovim#7349
0f2873c Windows: multibyte startup arguments neovim#7060

CHANGES:
9ff0cc7 :terminal : start in normal-mode neovim#6808
032b088 lower priority of 'cursorcolumn', 'colorcolumn' neovim#7364
2a3bcd1 RPC: Don't delay notifications when request is pending neovim#6544
023f67c :terminal : Do not change 'number', 'relativenumber' neovim#6796
1ef2d76 socket.c: Disable Nagle's algorithm on TCP sockets neovim#6915
6720fe2 help: `K` tries Vim help instead of manpage neovim#3104
7068370 help, man.vim: change "outline" map to `gO` neovim#7405
@justinmk justinmk mentioned this pull request Nov 8, 2017
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@justinmk justinmk justinmk left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ZyX-I @justinmk @marvim