From 4d2e65347ee0207328b14753ee2ea5628ced7d17 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 28 Jan 2025 16:02:39 +0100
Subject: [PATCH 1/2] /vsis3/: advertize AWS_PROFILE in options

Fixes https://github.com/qgis/QGIS/issues/60288
---
 port/cpl_vsil_s3.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/port/cpl_vsil_s3.cpp b/port/cpl_vsil_s3.cpp
index d5623a51b9f3..f79de5ba203f 100644
--- a/port/cpl_vsil_s3.cpp
+++ b/port/cpl_vsil_s3.cpp
@@ -1929,9 +1929,13 @@ const char *VSIS3FSHandler::GetOptions()
                 "to "
                 "determine if current host is an AWS EC2 instance' "
                 "default='YES'/>"
-                "  <Option name='AWS_DEFAULT_PROFILE' type='string' "
+                "  <Option name='AWS_PROFILE' type='string' "
                 "description='Name of the profile to use for IAM credentials "
                 "retrieval on EC2 instances' default='default'/>"
+                "  <Option name='AWS_DEFAULT_PROFILE' type='string' "
+                "description='(deprecated) Name of the profile to use for "
+                "IAM credentials "
+                "retrieval on EC2 instances' default='default'/>"
                 "  <Option name='AWS_CONFIG_FILE' type='string' "
                 "description='Filename that contains AWS configuration' "
                 "default='~/.aws/config'/>"

From 92c186a24604c88e3ba91fc1473103016a785d46 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 28 Jan 2025 19:23:27 +0100
Subject: [PATCH 2/2] MiraMon: remove useless nullptr check (fixes
 https://github.com/OSGeo/gdal/security/code-scanning/627)

---
 ogr/ogrsf_frmts/miramon/mm_wrlayr.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/ogr/ogrsf_frmts/miramon/mm_wrlayr.c b/ogr/ogrsf_frmts/miramon/mm_wrlayr.c
index b333c9456b8d..3557731fd13f 100644
--- a/ogr/ogrsf_frmts/miramon/mm_wrlayr.c
+++ b/ogr/ogrsf_frmts/miramon/mm_wrlayr.c
@@ -2643,13 +2643,13 @@ int MMAppendBlockToBuffer(struct MM_FLUSH_INFO *FlushInfo)
 // Copy the contents of a temporary file to a final file.
 // Used everywhere when closing layers.
 int MMMoveFromFileToFile(FILE_TYPE *pSrcFile, FILE_TYPE *pDestFile,
-                         MM_FILE_OFFSET *nOffset)
+                         MM_FILE_OFFSET *pnOffset)
 {
     size_t bufferSize = 1024 * 1024;  // 1 MB buffer;
     unsigned char *buffer;
     size_t bytesRead, bytesWritten;
 
-    if (!pSrcFile || !pDestFile || !nOffset)
+    if (!pSrcFile || !pDestFile || !pnOffset)
         return 0;
 
     buffer = (unsigned char *)calloc_function(bufferSize);
@@ -2658,7 +2658,7 @@ int MMMoveFromFileToFile(FILE_TYPE *pSrcFile, FILE_TYPE *pDestFile,
         return 1;
 
     fseek_function(pSrcFile, 0, SEEK_SET);
-    fseek_function(pDestFile, *nOffset, SEEK_SET);
+    fseek_function(pDestFile, *pnOffset, SEEK_SET);
     while ((bytesRead = fread_function(buffer, sizeof(unsigned char),
                                        bufferSize, pSrcFile)) > 0)
     {
@@ -2669,8 +2669,7 @@ int MMMoveFromFileToFile(FILE_TYPE *pSrcFile, FILE_TYPE *pDestFile,
             free_function(buffer);
             return 1;
         }
-        if (nOffset)
-            (*nOffset) += bytesWritten;
+        (*pnOffset) += bytesWritten;
     }
     free_function(buffer);
     return 0;