JsonConfig: refactor string buffer JSON handling for robustness

CarterLi · CarterLi · commit 3cef51ec4ad6 · 2025-08-02T17:41:19.000+08:00
diff --git a/src/common/jsonconfig.c b/src/common/jsonconfig.c
@@ -16,12 +16,12 @@ bool ffJsonConfigParseModuleArgs(const char* key, yyjson_val* val, FFModuleArgs*
 {
     if(ffStrEqualsIgnCase(key, "key"))
     {
-        ffStrbufSetNS(&moduleArgs->key, (uint32_t) yyjson_get_len(val), yyjson_get_str(val));
+        ffStrbufSetJsonVal(&moduleArgs->key, val);
         return true;
     }
     else if(ffStrEqualsIgnCase(key, "format"))
     {
-        ffStrbufSetNS(&moduleArgs->outputFormat, (uint32_t) yyjson_get_len(val), yyjson_get_str(val));
+        ffStrbufSetJsonVal(&moduleArgs->outputFormat, val);
         return true;
     }
     else if(ffStrEqualsIgnCase(key, "outputColor"))
@@ -41,7 +41,7 @@ bool ffJsonConfigParseModuleArgs(const char* key, yyjson_val* val, FFModuleArgs*
     }
     else if(ffStrEqualsIgnCase(key, "keyIcon"))
     {
-        ffStrbufSetS(&moduleArgs->keyIcon, yyjson_get_str(val));
+        ffStrbufSetJsonVal(&moduleArgs->keyIcon, val);
         return true;
     }
     return false;
diff --git a/src/detection/camera/camera_android.c b/src/detection/camera/camera_android.c
@@ -45,7 +45,7 @@ const char* ffDetectCamera(FF_MAYBE_UNUSED FFlist* result)
                 ffStrbufInitStatic(&camera->name, "Unknown");
         }
         ffStrbufInit(&camera->vendor);
-        ffStrbufInitS(&camera->id, yyjson_get_str(yyjson_obj_get(device, "id")));
+        ffStrbufInitJsonVal(&camera->id, yyjson_obj_get(device, "id"));
         yyjson_val* sizes = yyjson_arr_get_first(yyjson_obj_get(device, "jpeg_output_sizes"));
         if (yyjson_is_obj(sizes))
         {
diff --git a/src/detection/packages/packages_windows.c b/src/detection/packages/packages_windows.c
@@ -59,7 +59,7 @@ static void detectScoop(FFPackagesResult* result)
     {
         ffStrbufClear(&scoopPath);
         if (root)
-            ffStrbufSetS(&scoopPath, yyjson_get_str(yyjson_obj_get(root, "root_path")));
+            ffStrbufSetJsonVal(&scoopPath, yyjson_obj_get(root, "root_path"));
         if (scoopPath.length == 0)
         {
             ffStrbufSet(&scoopPath, &instance.state.platform.homeDir);
@@ -72,7 +72,7 @@ static void detectScoop(FFPackagesResult* result)
     {
         ffStrbufClear(&scoopPath);
         if (root)
-            ffStrbufSetS(&scoopPath, yyjson_get_str(yyjson_obj_get(root, "global_path")));
+            ffStrbufSetJsonVal(&scoopPath, yyjson_obj_get(root, "global_path"));
         if (scoopPath.length == 0)
         {
             ffStrbufSetS(&scoopPath, getenv("ProgramData"));
diff --git a/src/detection/publicip/publicip.c b/src/detection/publicip/publicip.c
@@ -84,7 +84,7 @@ const char* ffDetectPublicIp(FFPublicIpOptions* options, FFPublicIpResult* resul
         if (doc)
         {
             yyjson_val* root = yyjson_doc_get_root(doc);
-            ffStrbufAppendS(&result->ip, yyjson_get_str(yyjson_obj_get(root, "ip")));
+            ffStrbufAppendJsonVal(&result->ip, yyjson_obj_get(root, "ip"));
             ffStrbufDestroy(&result->location);
             ffStrbufInitF(&result->location, "%s, %s", yyjson_get_str(yyjson_obj_get(root, "city")), yyjson_get_str(yyjson_obj_get(root, "country")));
             return NULL;
diff --git a/src/detection/terminalfont/terminalfont_windows.c b/src/detection/terminalfont/terminalfont_windows.c
@@ -23,16 +23,14 @@ static const char* detectWTProfile(yyjson_val* profile, FFstrbuf* name, double*
 
     if (name->length == 0)
     {
-        yyjson_val* pface = yyjson_obj_get(font, "face");
-        if(yyjson_is_str(pface))
-            ffStrbufAppendS(name, unsafe_yyjson_get_str(pface));
+        ffStrbufAppendJsonVal(name, yyjson_obj_get(font, "face"));
     }
 
     if (*size < 0)
     {
         yyjson_val* psize = yyjson_obj_get(font, "size");
         if (yyjson_is_num(psize))
-            *size = yyjson_get_num(psize);
+            *size = unsafe_yyjson_get_num(psize);
     }
     return NULL;
 }
diff --git a/src/detection/wifi/wifi_android.c b/src/detection/wifi/wifi_android.c
@@ -46,7 +46,7 @@ const char* ffDetectWifi(FFlist* result)
     item->conn.channel = 0;
     item->conn.frequency = 0;
 
-    ffStrbufAppendS(&item->inf.status, yyjson_get_str(yyjson_obj_get(root, "supplicant_state")));
+    ffStrbufAppendJsonVal(&item->inf.status, yyjson_obj_get(root, "supplicant_state"));
     if(!item->inf.status.length)
     {
         ffStrbufAppendS(&item->inf.status, "Unknown");
@@ -59,9 +59,9 @@ const char* ffDetectWifi(FFlist* result)
     double rssi = yyjson_get_num(yyjson_obj_get(root, "rssi"));
     item->conn.signalQuality = rssi >= -50 ? 100 : rssi <= -100 ? 0 : (rssi + 100) * 2;
 
-    ffStrbufAppendS(&item->inf.description, yyjson_get_str(yyjson_obj_get(root, "ip")));
-    ffStrbufAppendS(&item->conn.bssid, yyjson_get_str(yyjson_obj_get(root, "bssid")));
-    ffStrbufAppendS(&item->conn.ssid, yyjson_get_str(yyjson_obj_get(root, "ssid")));
+    ffStrbufAppendJsonVal(&item->inf.description, yyjson_obj_get(root, "ip"));
+    ffStrbufAppendJsonVal(&item->conn.bssid, yyjson_obj_get(root, "bssid"));
+    ffStrbufAppendJsonVal(&item->conn.ssid, yyjson_obj_get(root, "ssid"));
     item->conn.frequency = (uint16_t) yyjson_get_int(yyjson_obj_get(root, "frequency_mhz"));
     item->conn.txRate = yyjson_get_num(yyjson_obj_get(root, "link_speed_mbps"));
     item->conn.channel = ffWifiFreqToChannel(item->conn.frequency);
diff --git a/src/modules/command/command.c b/src/modules/command/command.c
@@ -86,19 +86,19 @@ void ffParseCommandJsonObject(FFCommandOptions* options, yyjson_val* module)
 
         if (ffStrEqualsIgnCase(key, "shell"))
         {
-            ffStrbufSetS(&options->shell, yyjson_get_str(val));
+            ffStrbufSetJsonVal(&options->shell, val);
             continue;
         }
 
         if (ffStrEqualsIgnCase(key, "param"))
         {
-            ffStrbufSetS(&options->param, yyjson_get_str(val));
+            ffStrbufSetJsonVal(&options->param, val);
             continue;
         }
 
         if (ffStrEqualsIgnCase(key, "text"))
         {
-            ffStrbufSetS(&options->text, yyjson_get_str(val));
+            ffStrbufSetJsonVal(&options->text, val);
             continue;
         }
 
diff --git a/src/modules/disk/disk.c b/src/modules/disk/disk.c
@@ -312,19 +312,19 @@ void ffParseDiskJsonObject(FFDiskOptions* options, yyjson_val* module)
 
         if (ffStrEqualsIgnCase(key, "folders"))
         {
-            ffStrbufSetS(&options->folders, yyjson_get_str(val));
+            ffStrbufSetJsonVal(&options->folders, val);
             continue;
         }
 
         if (ffStrEqualsIgnCase(key, "hideFolders"))
         {
-            ffStrbufSetS(&options->hideFolders, yyjson_get_str(val));
+            ffStrbufSetJsonVal(&options->hideFolders, val);
             continue;
         }
 
         if (ffStrEqualsIgnCase(key, "hideFS"))
         {
-            ffStrbufSetS(&options->hideFS, yyjson_get_str(val));
+            ffStrbufSetJsonVal(&options->hideFS, val);
             continue;
         }
 
diff --git a/src/modules/diskio/diskio.c b/src/modules/diskio/diskio.c
@@ -138,7 +138,7 @@ void ffParseDiskIOJsonObject(FFDiskIOOptions* options, yyjson_val* module)
 
         if (ffStrEqualsIgnCase(key, "namePrefix"))
         {
-            ffStrbufSetS(&options->namePrefix, yyjson_get_str(val));
+            ffStrbufSetJsonVal(&options->namePrefix, val);
             continue;
         }
 
diff --git a/src/modules/localip/localip.c b/src/modules/localip/localip.c
@@ -407,7 +407,7 @@ void ffParseLocalIpJsonObject(FFLocalIpOptions* options, yyjson_val* module)
 
         if (ffStrEqualsIgnCase(key, "namePrefix"))
         {
-            ffStrbufSetS(&options->namePrefix, yyjson_get_str(val));
+            ffStrbufSetJsonVal(&options->namePrefix, val);
             continue;
         }
 
diff --git a/src/modules/netio/netio.c b/src/modules/netio/netio.c
@@ -152,7 +152,7 @@ void ffParseNetIOJsonObject(FFNetIOOptions* options, yyjson_val* module)
 
         if (ffStrEqualsIgnCase(key, "namePrefix"))
         {
-            ffStrbufSetS(&options->namePrefix, yyjson_get_str(val));
+            ffStrbufSetJsonVal(&options->namePrefix, val);
             continue;
         }
 
diff --git a/src/modules/packages/packages.c b/src/modules/packages/packages.c
@@ -345,7 +345,12 @@ void ffParsePackagesJsonObject(FFPackagesOptions* options, yyjson_val* module)
                 size_t flagIdx, flagMax;
                 yyjson_arr_foreach(val, flagIdx, flagMax, flagObj)
                 {
-                    const char* flag = yyjson_get_str(flagObj);
+                    if (!yyjson_is_str(flagObj))
+                    {
+                        ffPrintError(FF_PACKAGES_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Invalid JSON value for %s", key);
+                        continue;
+                    }
+                    const char* flag = unsafe_yyjson_get_str(flagObj);
 
                     #define FF_TEST_PACKAGE_NAME(name) else if (ffStrEqualsIgnCase(flag, #name)) { options->disabled |= FF_PACKAGES_FLAG_ ## name ## _BIT; }
                     switch (toupper(flag[0]))
diff --git a/src/modules/physicaldisk/physicaldisk.c b/src/modules/physicaldisk/physicaldisk.c
@@ -167,7 +167,7 @@ void ffParsePhysicalDiskJsonObject(FFPhysicalDiskOptions* options, yyjson_val* m
 
         if (ffStrEqualsIgnCase(key, "namePrefix"))
         {
-            ffStrbufSetS(&options->namePrefix, yyjson_get_str(val));
+            ffStrbufSetJsonVal(&options->namePrefix, val);
             continue;
         }
 
diff --git a/src/modules/publicip/publicip.c b/src/modules/publicip/publicip.c
@@ -82,7 +82,7 @@ void ffParsePublicIpJsonObject(FFPublicIpOptions* options, yyjson_val* module)
 
         if (ffStrEqualsIgnCase(key, "url"))
         {
-            ffStrbufSetS(&options->url, yyjson_get_str(val));
+            ffStrbufSetJsonVal(&options->url, val);
             continue;
         }
 
diff --git a/src/modules/separator/separator.c b/src/modules/separator/separator.c
@@ -152,7 +152,7 @@ void ffParseSeparatorJsonObject(FFSeparatorOptions* options, yyjson_val* module)
 
         if (ffStrEqualsIgnCase(key, "string"))
         {
-            ffStrbufSetS(&options->string, yyjson_get_str(val));
+            ffStrbufSetJsonVal(&options->string, val);
             continue;
         }
 
diff --git a/src/modules/weather/weather.c b/src/modules/weather/weather.c
@@ -72,13 +72,13 @@ void ffParseWeatherJsonObject(FFWeatherOptions* options, yyjson_val* module)
 
         if (ffStrEqualsIgnCase(key, "location"))
         {
-            ffStrbufSetS(&options->location, yyjson_get_str(val));
+            ffStrbufSetJsonVal(&options->location, val);
             continue;
         }
 
         if (ffStrEqualsIgnCase(key, "outputFormat"))
         {
-            ffStrbufSetS(&options->outputFormat, yyjson_get_str(val));
+            ffStrbufSetJsonVal(&options->outputFormat, val);
             continue;
         }
 
diff --git a/src/options/display.c b/src/options/display.c
@@ -48,7 +48,7 @@ const char* ffOptionsParseDisplayJsonConfig(FFOptionsDisplay* options, yyjson_va
         else if (ffStrEqualsIgnCase(key, "hideCursor"))
             options->hideCursor = yyjson_get_bool(val);
         else if (ffStrEqualsIgnCase(key, "separator"))
-            ffStrbufSetS(&options->keyValueSeparator, yyjson_get_str(val));
+            ffStrbufSetJsonVal(&options->keyValueSeparator, val);
         else if (ffStrEqualsIgnCase(key, "color"))
         {
             if (yyjson_is_str(val))
@@ -58,18 +58,18 @@ const char* ffOptionsParseDisplayJsonConfig(FFOptionsDisplay* options, yyjson_va
             }
             else if (yyjson_is_obj(val))
             {
-                const char* colorKeys = yyjson_get_str(yyjson_obj_get(val, "keys"));
+                yyjson_val* colorKeys = yyjson_obj_get(val, "keys");
                 if (colorKeys)
-                    ffOptionParseColor(colorKeys, &options->colorKeys);
-                const char* colorTitle = yyjson_get_str(yyjson_obj_get(val, "title"));
+                    ffOptionParseColor(yyjson_get_str(colorKeys), &options->colorKeys);
+                yyjson_val* colorTitle = yyjson_obj_get(val, "title");
                 if (colorTitle)
-                    ffOptionParseColor(colorTitle, &options->colorTitle);
-                const char* colorOutput = yyjson_get_str(yyjson_obj_get(val, "output"));
+                    ffOptionParseColor(yyjson_get_str(colorTitle), &options->colorTitle);
+                yyjson_val* colorOutput = yyjson_obj_get(val, "output");
                 if (colorOutput)
-                    ffOptionParseColor(colorOutput, &options->colorOutput);
-                const char* colorSeparator = yyjson_get_str(yyjson_obj_get(val, "separator"));
+                    ffOptionParseColor(yyjson_get_str(colorOutput), &options->colorOutput);
+                yyjson_val* colorSeparator = yyjson_obj_get(val, "separator");
                 if (colorSeparator)
-                    ffOptionParseColor(colorSeparator, &options->colorSeparator);
+                    ffOptionParseColor(yyjson_get_str(colorSeparator), &options->colorSeparator);
             }
             else
                 return "display.color must be either a string or an object";
@@ -268,21 +268,21 @@ const char* ffOptionsParseDisplayJsonConfig(FFOptionsDisplay* options, yyjson_va
                 {
                     if (!yyjson_is_obj(char_)) return "display.bar.char must be an object";
 
-                    const char* charElapsed = yyjson_get_str(yyjson_obj_get(char_, "elapsed"));
+                    yyjson_val* charElapsed = yyjson_obj_get(char_, "elapsed");
                     if (charElapsed)
-                        ffStrbufSetS(&options->barCharElapsed, charElapsed);
+                        ffStrbufSetJsonVal(&options->barCharElapsed, charElapsed);
 
-                    const char* charTotal = yyjson_get_str(yyjson_obj_get(char_, "total"));
+                    yyjson_val* charTotal = yyjson_obj_get(char_, "total");
                     if (charTotal)
-                        ffStrbufSetS(&options->barCharTotal, charTotal);
+                        ffStrbufSetJsonVal(&options->barCharTotal, charTotal);
                 }
                 else
                 {
-                    const char* charElapsed = yyjson_get_str(yyjson_obj_get(val, "charElapsed"));
+                    yyjson_val* charElapsed = yyjson_obj_get(val, "charElapsed");
                     if (charElapsed)
                         return "display.bar.charElapsed has been renamed to display.bar.char.elapsed.";
 
-                    const char* charTotal = yyjson_get_str(yyjson_obj_get(val, "charTotal"));
+                    yyjson_val* charTotal = yyjson_obj_get(val, "charTotal");
                     if (charTotal)
                         return "display.bar.charTotal has been renamed to display.bar.char.total.";
                 }
@@ -303,19 +303,19 @@ const char* ffOptionsParseDisplayJsonConfig(FFOptionsDisplay* options, yyjson_va
 
                         yyjson_val* borderLeft = yyjson_obj_get(border, "left");
                         if (borderLeft)
-                            ffStrbufSetS(&options->barBorderLeft, yyjson_get_str(borderLeft));
+                            ffStrbufSetJsonVal(&options->barBorderLeft, borderLeft);
 
                         yyjson_val* borderRight = yyjson_obj_get(border, "right");
                         if (borderRight)
-                            ffStrbufSetS(&options->barBorderRight, yyjson_get_str(borderRight));
+                            ffStrbufSetJsonVal(&options->barBorderRight, borderRight);
 
                         yyjson_val* borderLeftElapsed = yyjson_obj_get(border, "leftElapsed");
                         if (borderLeftElapsed)
-                            ffStrbufSetS(&options->barBorderLeftElapsed, yyjson_get_str(borderLeftElapsed));
+                            ffStrbufSetJsonVal(&options->barBorderLeftElapsed, borderLeftElapsed);
 
                         yyjson_val* borderRightElapsed = yyjson_obj_get(border, "rightElapsed");
                         if (borderRightElapsed)
-                            ffStrbufSetS(&options->barBorderRightElapsed, yyjson_get_str(borderRightElapsed));
+                            ffStrbufSetJsonVal(&options->barBorderRightElapsed, borderRightElapsed);
                     }
                 }
                 else
@@ -418,7 +418,7 @@ const char* ffOptionsParseDisplayJsonConfig(FFOptionsDisplay* options, yyjson_va
             yyjson_val* item;
             size_t idx, max;
             yyjson_arr_foreach(val, idx, max, item)
-                ffStrbufInitS(ffListAdd(&options->constants), yyjson_get_str(item));
+                ffStrbufInitJsonVal(ffListAdd(&options->constants), item);
         }
         else if (ffStrEqualsIgnCase(key, "freq"))
         {
diff --git a/src/options/general.c b/src/options/general.c
@@ -18,21 +18,23 @@ const char* ffOptionsParseGeneralJsonConfig(FFOptionsGeneral* options, yyjson_va
     {
         const char* key = yyjson_get_str(key_);
 
-        if (ffStrEqualsIgnCase(key, "thread") || ffStrEqualsIgnCase(key, "multithreading"))
+        if (ffStrEqualsIgnCase(key, "thread"))
             options->multithreading = yyjson_get_bool(val);
         else if (ffStrEqualsIgnCase(key, "processingTimeout"))
             options->processingTimeout = (int32_t) yyjson_get_int(val);
         else if (ffStrEqualsIgnCase(key, "preRun"))
         {
-            if (system(yyjson_get_str(val)) < 0)
+            if (!yyjson_is_str(val))
+                return "general.preRun must be a string";
+            if (system(unsafe_yyjson_get_str(val)) < 0)
                 return "Failed to execute preRun command";
         }
         else if (ffStrEqualsIgnCase(key, "detectVersion"))
             options->detectVersion = yyjson_get_bool(val);
 
         #if defined(__linux__) || defined(__FreeBSD__) || defined(__sun) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__HAIKU__)
         else if (ffStrEqualsIgnCase(key, "playerName"))
-            ffStrbufSetS(&options->playerName, yyjson_get_str(val));
+            ffStrbufSetJsonVal(&options->playerName, val);
         else if (ffStrEqualsIgnCase(key, "dsForceDrm"))
         {
             if (yyjson_is_str(val))
diff --git a/src/options/logo.c b/src/options/logo.c
@@ -263,8 +263,7 @@ const char* ffOptionsParseLogoJsonConfig(FFOptionsLogo* options, yyjson_val* roo
 
     if (yyjson_is_str(object))
     {
-        const char* value = yyjson_get_str(object);
-        ffStrbufSetS(&options->source, value);
+        ffStrbufSetJsonVal(&options->source, object);
         return NULL;
     }
 
@@ -305,7 +304,7 @@ const char* ffOptionsParseLogoJsonConfig(FFOptionsLogo* options, yyjson_val* roo
         }
         else if (ffStrEqualsIgnCase(key, "source"))
         {
-            ffStrbufSetS(&options->source, yyjson_get_str(val));
+            ffStrbufSetJsonVal(&options->source, val);
             continue;
         }
         else if (ffStrEqualsIgnCase(key, "color"))
@@ -403,7 +402,7 @@ const char* ffOptionsParseLogoJsonConfig(FFOptionsLogo* options, yyjson_val* roo
 
             yyjson_val* symbols = yyjson_obj_get(val, "symbols");
             if (symbols)
-                ffStrbufSetS(&options->chafaSymbols, yyjson_get_str(symbols));
+                ffStrbufSetJsonVal(&options->chafaSymbols, symbols);
 
             yyjson_val* canvasMode = yyjson_obj_get(val, "canvasMode");
             if (canvasMode)
diff --git a/src/util/FFstrbuf.c b/src/util/FFstrbuf.c
@@ -219,12 +219,6 @@ void ffStrbufPrependC(FFstrbuf* strbuf, char c)
     strbuf->length += 1;
 }
 
-void ffStrbufSetNS(FFstrbuf* strbuf, uint32_t length, const char* value)
-{
-    ffStrbufClear(strbuf);
-    ffStrbufAppendNS(strbuf, length, value);
-}
-
 void ffStrbufTrimLeft(FFstrbuf* strbuf, char c)
 {
     if(strbuf->length == 0)
diff --git a/src/util/FFstrbuf.h b/src/util/FFstrbuf.h

Original file line number	Diff line number	Diff line change
`@@ -16,12 +16,12 @@ bool ffJsonConfigParseModuleArgs(const char* key, yyjson_val* val, FFModuleArgs*`
`16`	`16`	`{`
`17`	`17`	`if(ffStrEqualsIgnCase(key, "key"))`
`18`	`18`	`{`
`19`		`- ffStrbufSetNS(&moduleArgs->key, (uint32_t) yyjson_get_len(val), yyjson_get_str(val));`
	`19`	`+ ffStrbufSetJsonVal(&moduleArgs->key, val);`
`20`	`20`	`return true;`
`21`	`21`	`}`
`22`	`22`	`else if(ffStrEqualsIgnCase(key, "format"))`
`23`	`23`	`{`
`24`		`- ffStrbufSetNS(&moduleArgs->outputFormat, (uint32_t) yyjson_get_len(val), yyjson_get_str(val));`
	`24`	`+ ffStrbufSetJsonVal(&moduleArgs->outputFormat, val);`
`25`	`25`	`return true;`
`26`	`26`	`}`
`27`	`27`	`else if(ffStrEqualsIgnCase(key, "outputColor"))`
`@@ -41,7 +41,7 @@ bool ffJsonConfigParseModuleArgs(const char* key, yyjson_val* val, FFModuleArgs*`
`41`	`41`	`}`
`42`	`42`	`else if(ffStrEqualsIgnCase(key, "keyIcon"))`
`43`	`43`	`{`
`44`		`- ffStrbufSetS(&moduleArgs->keyIcon, yyjson_get_str(val));`
	`44`	`+ ffStrbufSetJsonVal(&moduleArgs->keyIcon, val);`
`45`	`45`	`return true;`
`46`	`46`	`}`
`47`	`47`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ const char* ffDetectCamera(FF_MAYBE_UNUSED FFlist* result)`
`45`	`45`	`ffStrbufInitStatic(&camera->name, "Unknown");`
`46`	`46`	`}`
`47`	`47`	`ffStrbufInit(&camera->vendor);`
`48`		`- ffStrbufInitS(&camera->id, yyjson_get_str(yyjson_obj_get(device, "id")));`
	`48`	`+ ffStrbufInitJsonVal(&camera->id, yyjson_obj_get(device, "id"));`
`49`	`49`	`yyjson_val* sizes = yyjson_arr_get_first(yyjson_obj_get(device, "jpeg_output_sizes"));`
`50`	`50`	`if (yyjson_is_obj(sizes))`
`51`	`51`	`{`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ static void detectScoop(FFPackagesResult* result)`
`59`	`59`	`{`
`60`	`60`	`ffStrbufClear(&scoopPath);`
`61`	`61`	`if (root)`
`62`		`- ffStrbufSetS(&scoopPath, yyjson_get_str(yyjson_obj_get(root, "root_path")));`
	`62`	`+ ffStrbufSetJsonVal(&scoopPath, yyjson_obj_get(root, "root_path"));`
`63`	`63`	`if (scoopPath.length == 0)`
`64`	`64`	`{`
`65`	`65`	`ffStrbufSet(&scoopPath, &instance.state.platform.homeDir);`
`@@ -72,7 +72,7 @@ static void detectScoop(FFPackagesResult* result)`
`72`	`72`	`{`
`73`	`73`	`ffStrbufClear(&scoopPath);`
`74`	`74`	`if (root)`
`75`		`- ffStrbufSetS(&scoopPath, yyjson_get_str(yyjson_obj_get(root, "global_path")));`
	`75`	`+ ffStrbufSetJsonVal(&scoopPath, yyjson_obj_get(root, "global_path"));`
`76`	`76`	`if (scoopPath.length == 0)`
`77`	`77`	`{`
`78`	`78`	`ffStrbufSetS(&scoopPath, getenv("ProgramData"));`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ const char* ffDetectPublicIp(FFPublicIpOptions* options, FFPublicIpResult* resul`
`84`	`84`	`if (doc)`
`85`	`85`	`{`
`86`	`86`	`yyjson_val* root = yyjson_doc_get_root(doc);`
`87`		`- ffStrbufAppendS(&result->ip, yyjson_get_str(yyjson_obj_get(root, "ip")));`
	`87`	`+ ffStrbufAppendJsonVal(&result->ip, yyjson_obj_get(root, "ip"));`
`88`	`88`	`ffStrbufDestroy(&result->location);`
`89`	`89`	`ffStrbufInitF(&result->location, "%s, %s", yyjson_get_str(yyjson_obj_get(root, "city")), yyjson_get_str(yyjson_obj_get(root, "country")));`
`90`	`90`	`return NULL;`
Original file line number	Diff line number	Diff line change
`@@ -23,16 +23,14 @@ static const char* detectWTProfile(yyjson_val* profile, FFstrbuf* name, double*`
`23`	`23`
`24`	`24`	`if (name->length == 0)`
`25`	`25`	`{`
`26`		`- yyjson_val* pface = yyjson_obj_get(font, "face");`
`27`		`- if(yyjson_is_str(pface))`
`28`		`- ffStrbufAppendS(name, unsafe_yyjson_get_str(pface));`
	`26`	`+ ffStrbufAppendJsonVal(name, yyjson_obj_get(font, "face"));`
`29`	`27`	`}`
`30`	`28`
`31`	`29`	`if (*size < 0)`
`32`	`30`	`{`
`33`	`31`	`yyjson_val* psize = yyjson_obj_get(font, "size");`
`34`	`32`	`if (yyjson_is_num(psize))`
`35`		`- *size = yyjson_get_num(psize);`
	`33`	`+ *size = unsafe_yyjson_get_num(psize);`
`36`	`34`	`}`
`37`	`35`	`return NULL;`
`38`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,19 +86,19 @@ void ffParseCommandJsonObject(FFCommandOptions* options, yyjson_val* module)`
`86`	`86`
`87`	`87`	`if (ffStrEqualsIgnCase(key, "shell"))`
`88`	`88`	`{`
`89`		`- ffStrbufSetS(&options->shell, yyjson_get_str(val));`
	`89`	`+ ffStrbufSetJsonVal(&options->shell, val);`
`90`	`90`	`continue;`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`if (ffStrEqualsIgnCase(key, "param"))`
`94`	`94`	`{`
`95`		`- ffStrbufSetS(&options->param, yyjson_get_str(val));`
	`95`	`+ ffStrbufSetJsonVal(&options->param, val);`
`96`	`96`	`continue;`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`if (ffStrEqualsIgnCase(key, "text"))`
`100`	`100`	`{`
`101`		`- ffStrbufSetS(&options->text, yyjson_get_str(val));`
	`101`	`+ ffStrbufSetJsonVal(&options->text, val);`
`102`	`102`	`continue;`
`103`	`103`	`}`
`104`	`104`
Original file line number	Diff line number	Diff line change
`@@ -312,19 +312,19 @@ void ffParseDiskJsonObject(FFDiskOptions* options, yyjson_val* module)`
`312`	`312`
`313`	`313`	`if (ffStrEqualsIgnCase(key, "folders"))`
`314`	`314`	`{`
`315`		`- ffStrbufSetS(&options->folders, yyjson_get_str(val));`
	`315`	`+ ffStrbufSetJsonVal(&options->folders, val);`
`316`	`316`	`continue;`
`317`	`317`	`}`
`318`	`318`
`319`	`319`	`if (ffStrEqualsIgnCase(key, "hideFolders"))`
`320`	`320`	`{`
`321`		`- ffStrbufSetS(&options->hideFolders, yyjson_get_str(val));`
	`321`	`+ ffStrbufSetJsonVal(&options->hideFolders, val);`
`322`	`322`	`continue;`
`323`	`323`	`}`
`324`	`324`
`325`	`325`	`if (ffStrEqualsIgnCase(key, "hideFS"))`
`326`	`326`	`{`
`327`		`- ffStrbufSetS(&options->hideFS, yyjson_get_str(val));`
	`327`	`+ ffStrbufSetJsonVal(&options->hideFS, val);`
`328`	`328`	`continue;`
`329`	`329`	`}`
`330`	`330`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ void ffParseDiskIOJsonObject(FFDiskIOOptions* options, yyjson_val* module)`
`138`	`138`
`139`	`139`	`if (ffStrEqualsIgnCase(key, "namePrefix"))`
`140`	`140`	`{`
`141`		`- ffStrbufSetS(&options->namePrefix, yyjson_get_str(val));`
	`141`	`+ ffStrbufSetJsonVal(&options->namePrefix, val);`
`142`	`142`	`continue;`
`143`	`143`	`}`
`144`	`144`
Original file line number	Diff line number	Diff line change
`@@ -407,7 +407,7 @@ void ffParseLocalIpJsonObject(FFLocalIpOptions* options, yyjson_val* module)`
`407`	`407`
`408`	`408`	`if (ffStrEqualsIgnCase(key, "namePrefix"))`
`409`	`409`	`{`
`410`		`- ffStrbufSetS(&options->namePrefix, yyjson_get_str(val));`
	`410`	`+ ffStrbufSetJsonVal(&options->namePrefix, val);`
`411`	`411`	`continue;`
`412`	`412`	`}`
`413`	`413`