corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1804073 - Part 3: Add JS::IsValidJSON. r=bthrall

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D174573
This commit is contained in:
Tooru Fujisawa
2023-04-20 01:04:49 +00:00
parent 2bdef64fd8
commit 04981898bb
2 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
js/public/JSON.h
View File

@@ -111,4 +111,15 @@ extern JS_PUBLIC_API bool JS_ParseJSONWithReviver(
JSContext* cx, JS::Handle<JSString*> str, JS::Handle<JS::Value> reviver,
JS::MutableHandle<JS::Value> vp);
namespace JS {
/**
* Returns true if the given text is valid JSON.
*/
extern JS_PUBLIC_API bool IsValidJSON(const JS::Latin1Char* chars,
uint32_t len);
extern JS_PUBLIC_API bool IsValidJSON(const char16_t* chars, uint32_t len);
} // namespace JS
#endif /* js_JSON_h */

23
js/src/vm/JSONParser.cpp
View File

@@ -29,6 +29,7 @@
#include "js/friend/ErrorMessages.h" // js::GetErrorMessage, JSMSG_*
#include "js/GCVector.h" // JS::GCVector
#include "js/Id.h" // jsid
#include "js/JSON.h" // JS::IsValidJSON
#include "js/RootingAPI.h" // JS::Handle, JS::MutableHandle, MutableWrappedPtrOperations
#include "js/TypeDecls.h" // Latin1Char
#include "js/Utility.h" // js_delete
@@ -1081,3 +1082,25 @@ template class js::JSONPerHandlerParser<char16_t,
template class js::JSONSyntaxParser<Latin1Char>;
template class js::JSONSyntaxParser<char16_t>;
template <typename CharT>
static bool IsValidJSONImpl(const CharT* chars, uint32_t len) {
FrontendContext fc;
JSONSyntaxParser<CharT> parser(&fc, mozilla::Range(chars, len));
if (!parser.parse()) {
MOZ_ASSERT(fc.hadErrors());
return false;
}
MOZ_ASSERT(!fc.hadErrors());
return true;
}
JS_PUBLIC_API bool JS::IsValidJSON(const JS::Latin1Char* chars, uint32_t len) {
return IsValidJSONImpl(chars, len);
}
JS_PUBLIC_API bool JS::IsValidJSON(const char16_t* chars, uint32_t len) {
return IsValidJSONImpl(chars, len);
}