(c-just-after-func-arglist-p): Safeguard against unbalanced sexps.

diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 15acecfa2a8855eb7e048ee2db73e188e7bb202d..32cd56d0ac38f775cbd1f19f7722726a36d0de98 100644 (file)
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -4272,14 +4272,16 @@ brace."
        ;; otherwise, we could be looking at a hanging member init
        ;; colon
        (goto-char checkpoint)
-       (while (eq (char-before) ?,)
-         ;; this will catch member inits with multiple
-         ;; line arglists
-         (forward-char -1)
-         (c-backward-syntactic-ws (c-point 'bol))
-         (if (eq (char-before) ?\))
-             (c-backward-sexp 2)
-           (c-backward-sexp 1))
+       (while (and
+               (eq (char-before) ?,)
+               ;; this will catch member inits with multiple
+               ;; line arglists
+               (progn
+                 (forward-char -1)
+                 (c-backward-syntactic-ws (c-point 'bol))
+                 (c-safe (c-backward-sexp 1) t))
+               (or (not (looking-at "\\s\("))
+                   (c-safe (c-backward-sexp 1) t)))
          (c-backward-syntactic-ws lim))
        (if (and (eq (char-before) ?:)
                 (progn