improve argument check

lucee · Oct 4, 2023 · 5471283 · 5471283
1 parent 4166618
commit 5471283
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/source/java/src/org/lucee/extension/resource/s3/S3.java b/source/java/src/org/lucee/extension/resource/s3/S3.java
@@ -212,7 +212,8 @@ public Bucket createDirectory(String bucketName, Object acl, String targetRegion
  }
  }
  if (!Util.isEmpty(targetRegion)) throw new S3Exception("could not create bucket [" + bucketName + "] with defined region [" + targetRegion + "]", ase);
- throw new S3Exception("could not create bucket [" + bucketName + "] with region [" + region + "]", ase);
+ if (!Util.isEmpty(region)) throw new S3Exception("could not create bucket [" + bucketName + "] with region [" + region + "]", ase);
+ throw new S3Exception("could not create bucket [" + bucketName + "]", ase);
  }
  finally {
  client.release();

diff --git a/source/java/src/org/lucee/extension/resource/s3/function/S3GetACL.java b/source/java/src/org/lucee/extension/resource/s3/function/S3GetACL.java
@@ -35,7 +35,7 @@ public class S3GetACL extends S3Function {
  public Object invoke(PageContext pc, Object[] args) throws PageException {
  CFMLEngine eng = CFMLEngineFactory.getInstance();
  Cast cast = eng.getCastUtil();
- if (args.length > 6 || args.length < 3) throw eng.getExceptionUtil().createFunctionException(pc, "S3GetACL", 3, 6, args.length);
+ if (args.length > 6 || args.length < 2) throw eng.getExceptionUtil().createFunctionException(pc, "S3GetACL", 1, 6, args.length);
 
  // required
  String bucketName = cast.toString(args[0]);

diff --git a/source/java/src/org/lucee/extension/resource/s3/function/S3GetMetaData.java b/source/java/src/org/lucee/extension/resource/s3/function/S3GetMetaData.java
@@ -35,7 +35,7 @@ public class S3GetMetaData extends S3Function {
  public Object invoke(PageContext pc, Object[] args) throws PageException {
  CFMLEngine eng = CFMLEngineFactory.getInstance();
  Cast cast = eng.getCastUtil();
- if (args.length > 6 || args.length < 3) throw eng.getExceptionUtil().createFunctionException(pc, "S3GetMetaData", 3, 6, args.length);
+ if (args.length > 6 || args.length < 2) throw eng.getExceptionUtil().createFunctionException(pc, "S3GetMetaData", 1, 6, args.length);
 
  // required
  String bucketName = cast.toString(args[0]);