Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update staging with new bug fix #452

Open
wants to merge 15 commits into
base: v2.x/staging
Choose a base branch
from
Open

Update staging with new bug fix #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
18bbf13
Merge pull request #385 from zowe/v2.x/staging
1000TurquoisePogs Jul 12, 2023
12a2d8e
Merge pull request #398 from zowe/v2.x/staging
1000TurquoisePogs Aug 29, 2023
c5756a2
Merge pull request #399 from zowe/v2.x/staging
1000TurquoisePogs Aug 31, 2023
d8cf144
Merge pull request #401 from zowe/v2.x/staging
1000TurquoisePogs Sep 6, 2023
f224a38
Merge pull request #408 from zowe/v2.x/staging
1000TurquoisePogs Oct 16, 2023
09a29ee
Zowe Suite v2.13.0
zowe-robot Nov 28, 2023
58629b4
Merge pull request #419 from zowe/v2.x/staging
1000TurquoisePogs Nov 28, 2023
909f73d
Merge pull request #420 from zowe/v2.x/staging
ifakhrutdinov Jan 9, 2024
73f3ef5
Zowe Suite v2.15.0
zowe-robot Feb 20, 2024
a4c134c
Zowe Suite v2.16.0
zowe-robot May 1, 2024
9dc3de7
Zowe Suite v2.16.0
zowe-robot May 2, 2024
a06fb31
Allow strings to be null for backward compat on recent bugfix
1000TurquoisePogs May 9, 2024
099a869
Merge pull request #450 from zowe/feature/v2/allow-null-string
1000TurquoisePogs May 10, 2024
fd6e3f0
Merge branch 'pr' into v2.x/staging
May 15, 2024
d3f50cb
Update staging with new changes
May 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/configmgr.proj.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PROJECT="configmgr"
VERSION=2.17.0
VERSION=2.16.0
DEPS="QUICKJS LIBYAML"

QUICKJS="quickjs"
Expand Down
2 changes: 1 addition & 1 deletion build/getesm.proj.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
PROJECT="getesm"
VERSION=2.17.0
VERSION=2.16.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this have been merged before building 2.16.0?

DEPS=""
24 changes: 23 additions & 1 deletion c/jsonschema.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1108,7 +1108,27 @@ static JSValueSpec *resolveRef(JsonValidator *validator, ValidityException *pend
static VResult validateJSONSimple(JsonValidator *validator,
Json *value, JSValueSpec *valueSpec, int depth, EvalSet *evalSetList){
if (jsonIsNull(value)){
return validateType(validator,JSTYPE_NULL,valueSpec,depth+1);
VResult typeResult = validateType(validator,JSTYPE_NULL,valueSpec,depth+1);
if (vStatusValid(typeResult.status)) {
return typeResult;
} else if (validator->allowStringToBeNull) {
// FIXME: Some users were relying upon a bug we fixed, where an empty value would be treated as a string.
// TODO: Remove this in v3, we should not keep this bug compatability forever.
if (((1 << JSTYPE_STRING) & valueSpec->typeMask) != 0){
Json *emptyStringJson = (Json*)safeMalloc(sizeof(Json), "Empty String JSON");
emptyStringJson->type = JSON_TYPE_STRING;
char emptyString[1] = {0};
emptyStringJson->data.string = emptyString;
// Check if schema is okay with an "empty string" as the previous bug had null be empty string.
VResult stringResult = validateJSONString(validator,emptyStringJson,valueSpec,depth+1);
safeFree((char*)emptyStringJson, sizeof(Json));
return stringResult;
} else{
return simpleFailure(validator, "string cannot be null for %s\n", validatorAccessPath(validator));
}
} else {
return typeResult;
}
} else if (jsonIsBoolean(value)){
return validateType(validator,JSTYPE_BOOLEAN,valueSpec,depth+1);
} else if (jsonIsObject(value)){
Expand Down Expand Up @@ -1420,6 +1440,8 @@ static VResult validateJSON(JsonValidator *validator,
int jsonValidateSchema(JsonValidator *validator, Json *value, JsonSchema *topSchema,
JsonSchema **otherSchemas, int otherSchemaCount){
int result = 0;
validator->allowStringToBeNull = true;

if (setjmp(validator->recoveryData) == 0) { /* normal execution */
validator->topSchema = topSchema;
validator->otherSchemas = otherSchemas;
Expand Down
1 change: 1 addition & 0 deletions h/jsonschema.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ typedef struct JsonValidator_tag {
int fileRegexError;
jmp_buf recoveryData;
ShortLivedHeap *evalHeap;
bool allowStringToBeNull;
} JsonValidator;

#define JSON_SCHEMA_DRAFT_4 400
Expand Down
2 changes: 1 addition & 1 deletion manifest.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: zowe-common-c

version: 2.17.0
version: 2.16.0

homepage: https://zowe.org
keywords:
Expand Down
Loading