Fix segfault with AQ JSON payload with date and interval fields and code refactoring and formatting

Author: sharadraju

binding.gyp

@@ -11,6 +11,7 @@
              "src/njsTokenCallback.c",
              "src/njsConnection.c",
              "src/njsDbObject.c",
+             "src/njsJsContext.c",
              "src/njsJsonBuffer.c",
              "src/njsLob.c",
              "src/njsModule.c",

doc/src/release_notes.rst

@@ -62,7 +62,7 @@ Common Changes
 Thin Mode Changes
 +++++++++++++++++
 
-#)  Added support for config-file, config-ociobject, and config-azurevault 
+#)  Added support for config-file, config-ociobject, and config-azurevault
     configuration providers.
 
 #)  Fixed bug which forced node-oracledb to resolve the database host name
@@ -105,6 +105,9 @@ Thick Mode Changes
     connections to Oracle Globally Distributed Databases are created with
     proper sharding key values.
 
+#)  Fixed segfault with date, timestamp and interval fields in JSON payloads,
+    when dequeuing AQ messages.
+
 #)  Fixed bug resulting in a segfault when unable to load the Oracle Client
     libraries (`ODPI-C <https://github.com/oracle/odpi>`__ change).
 

src/njsAqMessage.c

@@ -292,14 +292,17 @@ NJS_NAPI_METHOD_IMPL_SYNC(njsAqMessage_getPayload, 0, NULL)
     const char *value;
     dpiJsonNode *topNode;
     dpiJson *json;
+    njsJsContext jsContext;
 
     if (message->isPayloadJsonType) {
         // JSON
         if (dpiMsgProps_getPayloadJson(message->handle, &json) < 0)
             return false;
-        if (dpiJson_getValue(json, DPI_JSON_OPT_DATE_AS_DOUBLE, &topNode) < 0)
+        if (dpiJson_getValue(json, DPI_JSON_OPT_DEFAULT, &topNode) < 0)
             return false;
-        if (!njsBaton_getJsonNodeValue(NULL, topNode, env, returnValue))
+        if (!njsJsContext_populate(env, globals, &jsContext))
+            return false;
+        if (!njsJsContext_getJsonNodeValue(&jsContext, topNode, env, returnValue))
             return false;
     } else {
         // DB Object

src/njsAqQueue.c

@@ -134,7 +134,7 @@ static bool njsAqQueue_createMessage(njsBaton *baton, njsAqQueue *queue,
     NJS_CHECK_NAPI(env, napi_get_named_property(env, value, "payload",
             &payloadObj))
     NJS_CHECK_NAPI(env, napi_instanceof(env, payloadObj,
-            baton->jsDbObjectConstructor, &isDbObject))
+            baton->jsContext.jsDbObjectConstructor, &isDbObject))
     if (isDbObject) {
         // DB Object
         if (!njsDbObject_getInstance(baton->globals, env, payloadObj, &obj))
@@ -412,7 +412,7 @@ NJS_NAPI_METHOD_IMPL_ASYNC(njsAqQueue_enq, 1, NULL)
     if (!baton->msgProps)
         return njsBaton_setErrorInsufficientMemory(baton);
 
-    if (!njsBaton_setJsValues(baton, env))
+    if (!njsBaton_setJsContext(baton, env))
         return false;
     for (i = 0; i < baton->numMsgProps; i++) {
         NJS_CHECK_NAPI(env, napi_get_element(env, args[0], i, &message))