4 files changed, 10 insertions, 1 deletions

diff --git a/apps/plugins/lib/action_helper.h b/apps/plugins/lib/action_helper.h
index 58d9c6c303..53f5c840f8 100644
--- a/apps/plugins/lib/action_helper.h
+++ b/apps/plugins/lib/action_helper.h
@@ -27,7 +27,7 @@
 */
 #ifndef _ACTION_HELPER_H_
 #define _ACTION_HELPER_H_
-
+extern const size_t action_helper_maxbuffer;
 char* action_name(int action);
 char* context_name(int context);
 
diff --git a/apps/plugins/lib/action_helper.pl b/apps/plugins/lib/action_helper.pl
index 1dfdcfd070..742419e23b 100755
--- a/apps/plugins/lib/action_helper.pl
+++ b/apps/plugins/lib/action_helper.pl
@@ -140,10 +140,12 @@ printf "#define CONTEXTBUFSZ %d\n\n", $len_max_context;
 
 if ($len_max_action > $len_max_context)
 {
+    print "const size_t action_helper_maxbuffer = ACTIONBUFSZ;\n";
     print "static char name_buf[ACTIONBUFSZ];\n";
 }
 else
 {
+    print "const size_t action_helper_maxbuffer = CONTEXTBUFSZ;\n";
     print "static char name_buf[CONTEXTBUFSZ];\n";
 }
 print <<EOF
diff --git a/apps/plugins/lib/button_helper.h b/apps/plugins/lib/button_helper.h
index 1197b172b0..4087ba898a 100644
--- a/apps/plugins/lib/button_helper.h
+++ b/apps/plugins/lib/button_helper.h
@@ -32,7 +32,9 @@ struct available_button
  * generated at compile time you can still call it as such though
 * eg available_buttons[0] or  available_buttons[available_button_count] (NULL SENTINEL, 0)*/
 
+extern const size_t button_helper_maxbuffer;
 extern const struct available_button * const available_buttons;
 extern const int available_button_count;
+
 int get_button_names(char *buf, size_t bufsz, unsigned long button);
 #endif /* _BUTTON_HELPER_H_ */
diff --git a/apps/plugins/lib/button_helper.pl b/apps/plugins/lib/button_helper.pl
index 45c3fd9073..192df18d7f 100755
--- a/apps/plugins/lib/button_helper.pl
+++ b/apps/plugins/lib/button_helper.pl
@@ -26,12 +26,15 @@ my @buttons = ();
 my $count = 1; #null sentinel
 my $val;
 my $def;
+my $len_max_button = 0;
 while(my $line = <STDIN>)
 {
     chomp($line);
     if($line =~ /^#define (BUTTON_[^\s]+) (.+)$/)
     {
         $def = "{\"$1\", $2},\n";
+        my $slen = length($1) + 1; # NULL terminator
+        if ($slen > $len_max_button) { $len_max_button = $slen; }
         $val = $2;
         if($val =~ /^0/)
         {
@@ -53,6 +56,8 @@ print <<EOF
 #include "button.h"
 #include "button_helper.h"
 
+const size_t button_helper_maxbuffer = $len_max_button;
+
 static const struct available_button buttons[$count] = {
 EOF
 ;