Index: subversion/clients/cmdline/main.c
===================================================================
--- subversion/clients/cmdline/main.c	(revision 15136)
+++ subversion/clients/cmdline/main.c	(working copy)
@@ -879,6 +879,12 @@
           svn_pool_destroy (pool);
           return EXIT_FAILURE;
         }
+      else if (num_opts >= SVN_OPT_MAX_OPTIONS)
+        {
+          err = svn_error_create (SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
+                                  _("Too many options"));
+          return error_exit (err, stderr, FALSE, pool);
+        }
 
       /* Stash the option code in an array before parsing it. */
       received_opts[num_opts] = opt_id;