Redocly/redoc
1
1
Fork 0
mirror of https://github.com/Redocly/redoc.git synced 2024-11-26 02:23:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: avoid endless recursion in schema-walker in some cases

Browse Source 
fixes #418, #395
This commit is contained in:
Roman Hotsiy 2018-02-23 14:21:30 +02:00
parent 07d1a7bfc7
commit 309cc23de6
No known key found for this signature in database
GPG Key ID: 5CB7B3ACABA57CB0
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/services/schema-normalizer.service.ts
View File

@ -53,6 +53,15 @@ class SchemaWalker {
if (obj == undefined || typeof(obj) !== 'object') { if (obj == undefined || typeof(obj) !== 'object') {
return; return;
} }
if (obj['x-redoc-visited']) {
const res = visitor(obj, pointer);
obj['x-redoc-visited'] = false;
// circular, return only title and description
return { title: res.title, description: res.description }
}
obj['x-redoc-visited'] = true;
if (obj.properties) { if (obj.properties) {
let ptr = JsonPointer.join(pointer, ['properties']); let ptr = JsonPointer.join(pointer, ['properties']);
SchemaWalker.walkEach(obj.properties, ptr, visitor); SchemaWalker.walkEach(obj.properties, ptr, visitor);
@ -83,7 +92,9 @@ class SchemaWalker {
} }
} }
return visitor(obj, pointer); const res = visitor(obj, pointer);
obj['x-redoc-visited'] = false;
return res;
} }
private static walkEach(obj:Object, pointer:string, visitor:Function) { private static walkEach(obj:Object, pointer:string, visitor:Function) {