From 3b93d6c28182b91f110513c0f5412726ff858582 Mon Sep 17 00:00:00 2001
From: Pragmatic Software <pragma78@gmail.com>
Date: Wed, 30 Aug 2017 02:12:05 -0700
Subject: [PATCH] Escape single-quotes before using GetOptionsFromString and
 shellwords

---
 PBot/FactoidCommands.pm    | 1 +
 PBot/Factoids.pm           | 2 +-
 PBot/MessageHistory.pm     | 2 ++
 PBot/Plugins/Quotegrabs.pm | 1 +
 PBot/Plugins/RemindMe.pm   | 3 +--
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/PBot/FactoidCommands.pm b/PBot/FactoidCommands.pm
index 1a0ade4b..863f028d 100644
--- a/PBot/FactoidCommands.pm
+++ b/PBot/FactoidCommands.pm
@@ -890,6 +890,7 @@ sub factlog {
     chomp $getopt_error;
   };
 
+  $arguments =~ s/(?<!\\)'/\\'/g;
   my ($show_hostmask, $actual_timestamp);
   my ($ret, $args) = GetOptionsFromString($arguments,
     'h'  => \$show_hostmask,
diff --git a/PBot/Factoids.pm b/PBot/Factoids.pm
index 6d5589e1..bf0cfe13 100644
--- a/PBot/Factoids.pm
+++ b/PBot/Factoids.pm
@@ -470,7 +470,7 @@ sub expand_action_arguments {
     $action =~ s/\$args/$input/g;
   }
 
-  $input =~ s/'/\\'/g if defined $input;
+  $input =~ s/(?<!\\)'/\\'/g if defined $input;
   my @args = shellwords($input);
 
   my $const_action = $action;
diff --git a/PBot/MessageHistory.pm b/PBot/MessageHistory.pm
index 3994f2f1..a07c441f 100644
--- a/PBot/MessageHistory.pm
+++ b/PBot/MessageHistory.pm
@@ -149,6 +149,7 @@ sub list_also_known_as {
 
   Getopt::Long::Configure ("bundling");
 
+  $arguments =~ s/(?<!\\)'/\\'/g;
   my ($show_hostmasks, $show_gecos, $show_nickserv, $show_id, $show_relationship, $show_weak, $dont_use_aliases_table);
   my ($ret, $args) = GetOptionsFromString($arguments,
     'h'  => \$show_hostmasks,
@@ -241,6 +242,7 @@ sub recall_message {
   foreach my $recall (@recalls) {
     my ($recall_nick, $recall_history, $recall_channel, $recall_before, $recall_after, $recall_context, $recall_count);
 
+    $recall =~ s/(?<!\\)'/\\'/g;
     my ($ret, $args) = GetOptionsFromString($recall,
       'channel|c:s'        => \$recall_channel,
       'text|t|history|h:s' => \$recall_history,
diff --git a/PBot/Plugins/Quotegrabs.pm b/PBot/Plugins/Quotegrabs.pm
index 5756b169..16f7582d 100644
--- a/PBot/Plugins/Quotegrabs.pm
+++ b/PBot/Plugins/Quotegrabs.pm
@@ -322,6 +322,7 @@ sub show_random_quotegrab {
       chomp $getopt_error;
     };
 
+    $arguments =~ s/(?<!\\)'/\\'/g;
     my ($ret, $args) = GetOptionsFromString($arguments, 
       'channel|c=s' => \$channel_search, 
       'text|t=s'    => \$text_search);
diff --git a/PBot/Plugins/RemindMe.pm b/PBot/Plugins/RemindMe.pm
index c2fdf89c..2ce6b77a 100644
--- a/PBot/Plugins/RemindMe.pm
+++ b/PBot/Plugins/RemindMe.pm
@@ -209,8 +209,7 @@ sub remindme {
     chomp $getopt_error;
   };
 
-  $arguments =~ s/'/\\'/g;
-
+  $arguments =~ s/(?<!\\)'/\\'/g;
   my ($ret, $args) = GetOptionsFromString($arguments,
     'r:i' => \$repeat,
     't:s' => \$alarm,