src,buffer: evaluate THROW_AND_RETURN_IF_OOB() expression only once · nodejs/node@047d4de · GitHub

nodejs / node Public

• Notifications You must be signed in to change notification settings
• Fork 36.6k
• Star 120k

• Code
• Issues 635
• Pull requests 755
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 047d4de

Browse filesBrowse the repository at this point in the historyBrowse files

RaisinTen

authored and

bengl

committed

src,buffer: evaluate THROW_AND_RETURN_IF_OOB() expression only once

There's no need to evaluate the expression passed into the macro more than once. Fixes: #41935 Signed-off-by: Darshan Sen <raisinten@gmail.com> PR-URL: #41945 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: Evan Lucas <evanlucas@me.com> Reviewed-By: Anna Henningsen <anna@addaleax.net>

1 parent 0cc1a27 commit 047d4de
Copy full SHA for 047d4de

1 file changed

+3-2Lines changed: 3 additions & 2 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• src
  • node_buffer.cc

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎src/node_buffer.cc‎

Copy file name to clipboardExpand all lines: src/node_buffer.cc

+3-2Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -41,8 +41,9 @@
41	41
42	42	#define THROW_AND_RETURN_IF_OOB(r) \
43	43	do { \
44		- if ((r).IsNothing()) return; \
45		- if (!(r).FromJust()) \
	44	+ Maybe<bool> m = (r); \
	45	+ if (m.IsNothing()) return; \
	46	+ if (!m.FromJust()) \
46	47	return node::THROW_ERR_OUT_OF_RANGE(env, "Index out of range"); \
47	48	} while (0) \
48	49

0 commit comments

Comments

0 (0)