temp!

Signed-off-by: Alexandros Filios <alexandros.filios@ibm.com>

Author: alexandrosfilios

platform/view/services/db/driver/sql/common/vault.go

@@ -13,12 +13,12 @@ import (
 	"fmt"
 	"runtime/debug"
 	"strings"
-	"unicode/utf8"
 
 	"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/common/driver"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/common/utils/collections"
 	driver2 "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db/driver"
+	"golang.org/x/text/encoding/unicode"
 )
 
 type VaultTables struct {
@@ -278,29 +278,24 @@ func (db *VaultPersistence) UpdateStatusesValid(txIDs []driver.TxID, offset int)
 	return query, params
 }
 
-const minUnicodeRuneValue = string(0)
-const maxUnicodeRuneValue = string(utf8.MaxRune)
-const forbiddenRune = "\x00"
+// const minUnicodeRuneValue = string(0)
+// const maxUnicodeRuneValue = string(utf8.MaxRune)
+// const forbiddenRune = "\x00"
+//
+//	var replacements = map[string]string{
+//		minUnicodeRuneValue: "?0?",
+//		maxUnicodeRuneValue: "?1?",
+//		forbiddenRune:       "?2?",
+//	}
+var encoder = unicode.UTF8.NewEncoder()
+var decoder = unicode.UTF8.NewDecoder()
 
-var replacements = map[string]string{
-	minUnicodeRuneValue: "?0?",
-	maxUnicodeRuneValue: "?1?",
-	forbiddenRune:       "?2?",
-}
-
-// TODO: Better sanitization of inputs
 func escape(s string) (string, error) {
-	for forbidden, replacement := range replacements {
-		s = strings.ReplaceAll(s, forbidden, replacement)
-	}
-	return s, nil
+	return encoder.String(s)
 }
 
-func unescape(s string) string {
-	for forbidden, replacement := range replacements {
-		s = strings.ReplaceAll(s, replacement, forbidden)
-	}
-	return s
+func unescape(s string) (string, error) {
+	return decoder.String(s)
 }
 
 func convertStateRows(writes driver.Writes, metaWrites driver.MetaWrites) ([]stateRow, error) {
@@ -443,6 +438,9 @@ func (it *TxStateIterator) Next() (*driver.VersionedRead, error) {
 	if err != nil {
 		return nil, err
 	}
-	r.Key = unescape(r.Key)
+	r.Key, err = unescape(r.Key)
+	if err != nil {
+		return nil, err
+	}
 	return &r, nil
 }