Merge pull request #11902 from akallabeth/jansson-fix

Jansson fix

include/freerdp/utils/passphrase.h

@@ -67,7 +67,7 @@ extern "C"
 	 * @param prompt The prompt to show to the user
 	 * @param buf A pointer to a buffer that will receive the output
 	 * @param bufsiz The size of the buffer in bytes
-	 * @param from_stdin
+	 * @param from_stdin \b 0 if a terminal is expected, != 0 if data is read from stdin
 	 *
 	 * @return A pointer to \ref buf containing the password or \ref NULL in case of an error.
 	 */

winpr/libwinpr/utils/json/jansson.c

@@ -211,7 +211,7 @@ BOOL WINPR_JSON_IsArray(const WINPR_JSON* item)
 
 BOOL WINPR_JSON_IsObject(const WINPR_JSON* item)
 {
-	return json_is_array(ccast(item));
+	return json_is_object(ccast(item));
 }
 
 WINPR_JSON* WINPR_JSON_CreateNull(void)