Properly escape low char bytes, kriszyp/lmdb-js#190

kriszyp · Sep 25, 2022 · 51a494b · 51a494b
1 parent 561ab7c
commit 51a494b
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/index.js b/index.js
@@ -39,7 +39,10 @@ export function writeKey(key, target, position, inSequence) {
 			let i, c2
 			for (i = 0; i < strLength; i++) {
 				c1 = key.charCodeAt(i)
-				if (c1 < 0x80) {
+				if (c1 <= 4) {
+					target[position++] = 4
+					target[position++] = c1
+				} else if (c1 < 0x80) {
 					target[position++] = c1
 				} else if (c1 < 0x800) {
 					target[position++] = c1 >> 6 | 0xc0
@@ -250,10 +253,14 @@ function makeStringBuilder() {
 		let v = fromCharCode((i & 0xf) + 97) + fromCharCode((i >> 4) + 97)
 		stringBuildCode += `
 		let ${v} = source[position++]
-		if (!${v})
-		return fromCharCode(${previous})
-		else if (${v} >= 0x80)
-		${v} = finishUtf8(${v}, source)
+		if (${v} > 4) {
+			if (${v} >= 0x80) ${v} = finishUtf8(${v}, source)
+		} else {
+			if (${v} === 4)
+				${v} = source[position++]
+			else
+				return fromCharCode(${previous})
+		}
 		`
 		previous.push(v)
 		if (i == 1000000) // this just exists to prevent rollup from doing dead code elimination on finishUtf8

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ordered-binary",
   "author": "Kris Zyp",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "Conversion of JavaScript primitives to and from Buffer with binary order matching natural primitive order",
   "license": "MIT",
   "repository": {

diff --git a/tests/test.js b/tests/test.js
@@ -44,6 +44,8 @@ suite('key buffers', () => {
     assert.strictEqual(fromBufferKey(toBufferKey('4')), '4')
     assert.strictEqual(fromBufferKey(toBufferKey('hello')), 'hello')
     assert.strictEqual(fromBufferKey(toBufferKey('')), '')
+    assert.strictEqual(fromBufferKey(toBufferKey('\x00')), '\x00')
+    assert.strictEqual(fromBufferKey(toBufferKey('\x03test\x01\x00')), '\x03test\x01\x00')
   })
   test('string comparison', () => {
     assertBufferComparison(toBufferKey('4'), toBufferKey('5'))
@@ -64,8 +66,8 @@ suite('key buffers', () => {
       ['hello', 5.25])
     assert.deepEqual(fromBufferKey(toBufferKey([true, 1503579323825])),
       [true, 1503579323825])
-    assert.deepEqual(fromBufferKey(toBufferKey([-0.2525, 'second'])),
-      [-0.2525, 'second'])
+    assert.deepEqual(fromBufferKey(toBufferKey([-0.2525, 'sec\x00nd'])),
+      [-0.2525, 'sec\x00nd'])
     assert.deepEqual(fromBufferKey(toBufferKey([-0.2525, '2nd', '3rd'])),
       [-0.2525, '2nd', '3rd'])
   })