Fix annotate() exception. Closes #1203

hapijs · May 28, 2017 · 539760b · 539760b
1 parent 5886567
commit 539760b
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 5 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2012-2016, Project contributors
+Copyright (c) 2012-2017, Project contributors
 Copyright (c) 2012-2014, Walmart
 All rights reserved.
 

diff --git a/lib/errors.js b/lib/errors.js
@@ -301,11 +301,13 @@ internals.annotate = function (stripColorCodes) {
             const seg = path[j];
 
             if (ref.isImmutable) {
-                // Joi schemas are not cloned by hoek, we have to take this extra step
-                ref = ref.clone();
+                ref = ref.clone();                              // joi schemas are not cloned by hoek, we have to take this extra step
             }
 
-            if (j + 1 < path.length && typeof ref[seg] !== 'string') {
+            if (j + 1 < path.length &&
+                ref[seg] &&
+                typeof ref[seg] !== 'string') {
+
                 ref = ref[seg];
             }
             else {

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "joi",
   "description": "Object schema validation",
-  "version": "10.5.0",
+  "version": "10.5.1",
   "homepage": "https://github.com/hapijs/joi",
   "repository": "git://github.com/hapijs/joi",
   "main": "lib/index.js",

diff --git a/test/errors.js b/test/errors.js
@@ -590,5 +590,35 @@ describe('errors', () => {
                 done();
             });
         });
+
+        it('handles child to uncle relationship inside a child', (done) => {
+
+            const object = {
+                response: {
+                    options: {
+                        stripUnknown: true
+                    }
+                }
+            };
+
+            const schema = Joi.object({
+                response: Joi.object({
+                    modify: Joi.boolean(),
+                    options: Joi.object()
+                })
+                    .assert('options.stripUnknown', Joi.ref('modify'), 'meet requirement of having peer modify set to true')
+            });
+
+            Joi.validate(object, schema, { abortEarly: false }, (err, value) => {
+
+                expect(err).to.exist();
+                expect(() => {
+
+                    err.annotate(true);
+                }).to.not.throw();
+
+                done();
+            });
+        });
     });
 });