[cli] Fix some error messages (#13896)

Fix #13662

Author: elpaso

apps/gdalalg_materialize.cpp

@@ -244,7 +244,7 @@ bool GDALMaterializeVectorAlgorithm::RunStep(GDALPipelineStepRunContext &ctxt)
     }
 
     CPLStringList aosOptions;
-    aosOptions.AddString("--invoked-from-gdal-vector-convert");
+    aosOptions.AddString("--invoked-from-gdal-algorithm");
     if (!m_overwrite)
     {
         aosOptions.AddString("--no-overwrite");

apps/gdalalg_vector_write.cpp

@@ -11,7 +11,6 @@
  ****************************************************************************/
 
 #include "gdalalg_vector_write.h"
-
 #include "cpl_string.h"
 #include "gdal_utils.h"
 #include "gdal_priv.h"
@@ -52,7 +51,7 @@ bool GDALVectorWriteAlgorithm::RunStep(GDALPipelineStepRunContext &ctxt)
     }
 
     CPLStringList aosOptions;
-    aosOptions.AddString("--invoked-from-gdal-vector-convert");
+    aosOptions.AddString("--invoked-from-gdal-algorithm");
     if (!m_overwrite)
     {
         aosOptions.AddString("--no-overwrite");
@@ -114,8 +113,11 @@ bool GDALVectorWriteAlgorithm::RunStep(GDALPipelineStepRunContext &ctxt)
                                 &hSrcDS, psOptions, nullptr));
         GDALVectorTranslateOptionsFree(psOptions);
     }
+
     if (!poRetDS)
+    {
         return false;
+    }
 
     if (!hOutDS)
     {

apps/ogr2ogr_lib.cpp

@@ -422,8 +422,8 @@ struct GDALVectorTranslateOptions
     /*! set to true to prevent overwriting existing dataset */
     bool bNoOverwrite = false;
 
-    /*! set to true to prevent if called from "gdal vector convert" */
-    bool bInvokedFromGdalVectorConvert = false;
+    /*! set to true to customize error messages when called from "new" (GDAL 3.11) CLI or Algorithm API */
+    bool bInvokedFromGdalAlgorithm = false;
 };
 
 struct TargetLayerInfo
@@ -2636,10 +2636,21 @@ GDALDatasetH GDALVectorTranslate(const char *pszDest, GDALDatasetH hDstDS,
         }
         if (bError)
         {
-            CPLError(CE_Failure, CPLE_IllegalArg,
-                     "-nln name must be specified combined with "
-                     "a single source layer name,\nor a -sql statement, and "
-                     "name must be different from an existing layer.");
+            if (psOptions->bInvokedFromGdalAlgorithm)
+            {
+                CPLError(CE_Failure, CPLE_IllegalArg,
+                         "--output-layer name must be specified combined with "
+                         "a single source layer name and it "
+                         "must be different from an existing layer.");
+            }
+            else
+            {
+                CPLError(
+                    CE_Failure, CPLE_IllegalArg,
+                    "-nln name must be specified combined with "
+                    "a single source layer name,\nor a -sql statement, and "
+                    "name must be different from an existing layer.");
+            }
             return nullptr;
         }
     }
@@ -2753,7 +2764,7 @@ GDALDatasetH GDALVectorTranslate(const char *pszDest, GDALDatasetH hDstDS,
             if (aoDrivers.empty())
             {
                 if (CPLGetExtensionSafe(pszDest).empty() &&
-                    !psOptions->bInvokedFromGdalVectorConvert)
+                    !psOptions->bInvokedFromGdalAlgorithm)
                 {
                     psOptions->osFormat = "ESRI Shapefile";
                 }
@@ -2902,7 +2913,7 @@ GDALDatasetH GDALVectorTranslate(const char *pszDest, GDALDatasetH hDstDS,
         }
         bNewDataSource = true;
 
-        if (psOptions->bInvokedFromGdalVectorConvert && !bSingleLayer &&
+        if (psOptions->bInvokedFromGdalAlgorithm && !bSingleLayer &&
             !bOutputDirectory &&
             (!poODS->TestCapability(ODsCCreateLayer) ||
              !poDriver->GetMetadataItem(GDAL_DCAP_MULTIPLE_VECTOR_LAYERS)))
@@ -3198,7 +3209,7 @@ GDALDatasetH GDALVectorTranslate(const char *pszDest, GDALDatasetH hDstDS,
                 }
                 else if (!poResultSet->TestCapability(OLCFastFeatureCount))
                 {
-                    if (!psOptions->bInvokedFromGdalVectorConvert)
+                    if (!psOptions->bInvokedFromGdalAlgorithm)
                     {
                         CPLError(
                             CE_Warning, CPLE_AppDefined,
@@ -3488,7 +3499,7 @@ GDALDatasetH GDALVectorTranslate(const char *pszDest, GDALDatasetH hDstDS,
                                             nullptr, psOptions.get())) &&
                     !psOptions->bSkipFailures)
                 {
-                    if (psOptions->bInvokedFromGdalVectorConvert)
+                    if (psOptions->bInvokedFromGdalAlgorithm)
                     {
                         CPLError(
                             CE_Failure, CPLE_AppDefined,
@@ -3664,7 +3675,7 @@ GDALDatasetH GDALVectorTranslate(const char *pszDest, GDALDatasetH hDstDS,
             {
                 if (!poLayer->TestCapability(OLCFastFeatureCount))
                 {
-                    if (!psOptions->bInvokedFromGdalVectorConvert)
+                    if (!psOptions->bInvokedFromGdalAlgorithm)
                     {
                         CPLError(
                             CE_Warning, CPLE_NotSupported,
@@ -3773,7 +3784,7 @@ GDALDatasetH GDALVectorTranslate(const char *pszDest, GDALDatasetH hDstDS,
                                         pProgressArg.get(), psOptions.get())) &&
                 !psOptions->bSkipFailures)
             {
-                if (psOptions->bInvokedFromGdalVectorConvert)
+                if (psOptions->bInvokedFromGdalAlgorithm)
                 {
                     CPLError(CE_Failure, CPLE_AppDefined,
                              "Failed to write layer '%s'. Use --skip-errors to "
@@ -5228,7 +5239,7 @@ SetupTargetLayer::Setup(OGRLayer *poSrcLayer, const char *pszNewLayerName,
     /* -------------------------------------------------------------------- */
     else if (!bAppend && !m_bNewDataSource)
     {
-        if (psOptions->bInvokedFromGdalVectorConvert)
+        if (psOptions->bInvokedFromGdalAlgorithm)
         {
             CPLError(CE_Failure, CPLE_AppDefined,
                      "Layer %s already exists, and --append not specified. "
@@ -8460,9 +8471,9 @@ static std::unique_ptr<GDALArgumentParser> GDALVectorTranslateOptionsGetParser(
         .store_into(psOptions->bNoOverwrite)
         .hidden();
 
-    // Undocumented option used by gdal vector convert
-    argParser->add_argument("--invoked-from-gdal-vector-convert")
-        .store_into(psOptions->bInvokedFromGdalVectorConvert)
+    // Undocumented option used by gdal vector * algorithms
+    argParser->add_argument("--invoked-from-gdal-algorithm")
+        .store_into(psOptions->bInvokedFromGdalAlgorithm)
         .hidden();
 
     if (psOptionsForBinary)

autotest/utilities/test_gdalalg_vector_convert.py

@@ -438,3 +438,33 @@ def create_src_file():
         assert f["other"] == "foo"
         assert f.GetGeometryRef().ExportToWkt() == "POINT (10 10)"
         ds = None
+
+
+@pytest.mark.require_driver("GeoJSON")
+def test_error_message_leak(tmp_vsimem):
+    """Test issue GH #13662"""
+
+    json_path = tmp_vsimem / "test_error_message_leak_in.json"
+    out_path = tmp_vsimem / "test_error_message_leak_out.shp"
+
+    src_ds = ogr.GetDriverByName("GeoJSON").CreateDataSource(json_path)
+    lyr = src_ds.CreateLayer("test")
+    f = ogr.Feature(lyr.GetLayerDefn())
+    f.SetGeometry(ogr.CreateGeometryFromWkt("POINT(1 2)"))
+    lyr.CreateFeature(f)
+    f = ogr.Feature(lyr.GetLayerDefn())
+    f.SetGeometry(ogr.CreateGeometryFromWkt("LINESTRING(1 2, 3 4)"))
+    lyr.CreateFeature(f)
+    src_ds = None
+
+    alg = get_convert_alg()
+    with pytest.raises(
+        Exception,
+        match="Failed to write layer 'test'. Use --skip-errors to ignore errors",
+    ):
+        alg.ParseRunAndFinalize(
+            [
+                json_path,
+                out_path,
+            ],
+        )

autotest/utilities/test_gdalalg_vector_edit.py

@@ -199,3 +199,24 @@ def test_gdalalg_vector_edit_unset_fid():
         assert lyr.GetFIDColumn() == ""
         f = lyr.GetNextFeature()
         assert f.GetFID() == 0
+
+
+@pytest.mark.require_driver("GPKG")
+def test_error_message_leak():
+    """Test issue GH #13662"""
+
+    alg = get_edit_alg()
+    in_filename = "../gdrivers/data/gpkg/byte.gpkg"
+    out_filename = in_filename
+    with pytest.raises(
+        Exception,
+        match="--output-layer name must be specified combined with a single source layer name and it must be different from an existing layer.",
+    ):
+        alg.ParseRunAndFinalize(
+            [
+                in_filename,
+                "--crs=EPSG:4326",
+                "--overwrite-layer",
+                out_filename,
+            ],
+        )