6 files changed, 17 insertions, 0 deletions

diff --git a/src/gmcerts.c b/src/gmcerts.c
index 2600b4cf..b8fb6a7f 100644
--- a/src/gmcerts.c
+++ b/src/gmcerts.c
@@ -266,6 +266,7 @@ static void load_GmCerts_(iGmCerts *d) {
         iRangecc       line    = iNullRange;
         while (nextSplit_Rangecc(&src, "\n", &line)) {
             iRegExpMatch m;
+            init_RegExpMatch(&m);
             if (matchRange_RegExp(pattern, line, &m)) {
                 const iRangecc domain = capturedRange_RegExpMatch(&m, 1);
                 const iRangecc until  = capturedRange_RegExpMatch(&m, 2);
diff --git a/src/gmdocument.c b/src/gmdocument.c
index 89d567b0..5bc16fda 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -197,6 +197,7 @@ static iRangecc addLink_GmDocument_(iGmDocument *d, iRangecc line, iGmLinkId *li
         pattern_ = new_RegExp("=>\\s*([^\\s]+)(\\s.*)?", caseInsensitive_RegExpOption);
     }
     iRegExpMatch m;
+    init_RegExpMatch(&m);
     if (matchRange_RegExp(pattern_, line, &m)) {
         iGmLink *link = new_GmLink();
         setRange_String(&link->url, capturedRange_RegExpMatch(&m, 1));
diff --git a/src/gmrequest.c b/src/gmrequest.c
index 6ea4aa50..c231e1f3 100644
--- a/src/gmrequest.c
+++ b/src/gmrequest.c
@@ -199,6 +199,17 @@ static void checkServerCertificate_GmRequest_(iGmRequest *d) {
         if (!isExpired_TlsCertificate(cert)) {
             d->resp.certFlags |= timeVerified_GmCertFlag;
         }
+        /* TODO: Check for IP too (see below), because it may be specified in the SAN. */
+#if 0
+        iString *ip = toStringFlags_Address(address_TlsRequest(d->req), noPort_SocketStringFlag, 0);
+        if (verifyIp_TlsCertificate(cert, ip)) {
+            printf("[GmRequest] IP address %s matches!\n", cstr_String(ip));
+        }
+        else {
+            printf("[GmRequest] IP address %s not matched\n", cstr_String(ip));
+        }
+        delete_String(ip);
+#endif
         if (verifyDomain_TlsCertificate(cert, domain)) {
             d->resp.certFlags |= domainVerified_GmCertFlag;
         }
@@ -303,6 +314,7 @@ static const iBlock *aboutPageSource_(iRangecc path) {
 static const iBlock *replaceVariables_(const iBlock *block) {
     iRegExp *var = new_RegExp("\\$\\{([^}]+)\\}", 0);
     iRegExpMatch m;
+    init_RegExpMatch(&m);
     if (matchRange_RegExp(var, range_Block(block), &m)) {
         iBlock *replaced = collect_Block(copy_Block(block));
         do {
diff --git a/src/gmutil.c b/src/gmutil.c
index cd00eb1d..2927953d 100644
--- a/src/gmutil.c
+++ b/src/gmutil.c
@@ -34,6 +34,7 @@ void init_Url(iUrl *d, const iString *text) {
                                          caseInsensitive_RegExpOption);
     }
     iRegExpMatch m;
+    init_RegExpMatch(&m);
     if (matchString_RegExp(absoluteUrlPattern_, text, &m)) {
         d->protocol = capturedRange_RegExpMatch(&m, 1);
         d->host     = capturedRange_RegExpMatch(&m, 2);
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 9f4708e7..6c0337a0 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -656,6 +656,7 @@ static void parseUser_DocumentWidget_(iDocumentWidget *d) {
     iRegExp *userPats[2] = { new_RegExp("~([^/?]+)", 0),
                              new_RegExp("/users/([^/?]+)", caseInsensitive_RegExpOption) };
     iRegExpMatch m;
+    init_RegExpMatch(&m);
     iForIndices(i, userPats) {
         if (matchString_RegExp(userPats[i], d->mod.url, &m)) {
             setRange_String(d->titleUser, capturedRange_RegExpMatch(&m, 1));
diff --git a/src/ui/text.c b/src/ui/text.c
index 40956e29..a4a3804d 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -434,6 +434,7 @@ static iRect run_Font_(iFont *d, enum iRunMode mode, iRangecc text, size_t maxLe
             /* ANSI escape. */
             chPos++;
             iRegExpMatch m;
+            init_RegExpMatch(&m);
             if (match_RegExp(text_.ansiEscape, chPos, text.end - chPos, &m)) {
                 if (mode == draw_RunMode) {
                     /* Change the color. */