Merge pull request #67 from chermehdi/cleanup/rand.h

Add bound checks for rand.h methods

Author: Eroui

config/config.go

@@ -12,7 +12,7 @@ import (
 	"gopkg.in/yaml.v2"
 )
 
-const LatestVersion = "1.0.0"
+const LatestVersion = "1.0.1"
 
 // Config The configuration of the CLI
 type Config struct {

templates/resolver.go

@@ -22,9 +22,13 @@ int main() {
 // This is embeded as a literal string for easy shipping with the binary.
 // We could consider using some new Go feature to embed it as a static resource.
 // At the time of creation of this, this is not a priority.
-const RandH = `
-#pragma once
+const RandH = `#pragma once
+
+#include <algorithm>
+#include <cassert>
+#include <climits>
 #include <ctime>
+#include <random>
 #include <string>
 
 const std::string LOWERCASE_ALPHABET = "abcdefghijklmnopqrstuvwyxz";
@@ -39,63 +43,71 @@ const int DIGITS = 1 << 2;
 
 // Returns a random value of the following types
 // int, long long, double, char, string
-// given main arguments 
+// given main arguments
 // Example:
 // Rand rand(argc, argv);
 // int randomInt = rand.Int();
 // string randomString = rand.String(10, DIGITS);
+//
+// @author NouemanKHAL
+//
 class Rand {
   unsigned int seed;
 
-  unsigned int ReadSeedFromArgs(int argc, char * argv[]) {
+  unsigned int ReadSeedFromArgs(int argc, char* argv[]) {
     if (argc > 0) {
       return std::stoi(argv[1]);
     }
     return 0;
   }
 
-public:
+ public:
+  Rand(unsigned int _seed = 0) : seed(_seed) { srand(seed); }
 
-  Rand(unsigned int _seed = 0) : seed(_seed) {
-    srand(seed);
-  }
-
-  Rand(int argc, char * argv[]) {
+  Rand(int argc, char* argv[]) {
     unsigned int seed = ReadSeedFromArgs(argc, argv);
-    Rand{ seed };
+    Rand{seed};
   }
 
   // Returns an random int value in the range [from, to] inclusive
   int Int(int from, int to) {
+    if (from == to) return from;
+    assert(from < to);
     return rand() % (to - from) + from;
   }
 
   // Returns an random long long value in the range [from, to] inclusive
   long long Long(long long from, long long to) {
+    if (from == to) return from;
+    assert(from < to);
     return rand() % (to - from) + from;
   }
 
   // Returns an random double value in the range [from, to] inclusive
   double Double(double from, double to) {
+    assert(from <= to);
     double tmp = (double)rand() / RAND_MAX;
     return from + tmp * (to - from);
   }
 
   // Returns an random char value in the range [from, to] inclusive
   // Parameters are optional
   char Char(char from = CHAR_MIN, char to = CHAR_MAX) {
-    return static_cast <char> (Int(from, to));
+    assert(from <= to);
+    return static_cast<char>(Int(from, to));
   }
 
   // Returns an random char value in the range [from, to] inclusive
   // Parameters are optional, by default returns a random lowercase letter
   char Lower(char from = 'a', char to = 'z') {
+    assert('a' <= from && from <= to && to <= 'z');
     return Char(from, to);
   }
 
   // Returns an random char value in the range [from, to] inclusive
   // Parameters are optional, by default returns a random uppercase letter
   char Upper(char from = 'A', char to = 'Z') {
+    assert('A' <= from && from <= to && to <= 'Z');
     return Char(from, to);
   }
 
@@ -107,8 +119,10 @@ public:
   }
 
   // Returns an random digit character
-  // Parameters are optional, by default returns a random digit character in the range ['0', '9'] inclusive
+  // Parameters are optional, by default returns a random digit character in the
+  // range ['0', '9'] inclusive
   char Digit(char from = '0', char to = '9') {
+    assert(from <= to);
     return Char(from, to);
   }
 
@@ -118,13 +132,13 @@ public:
     return Digit();
   }
 
+  // Returns a random boolean value.
+  bool Bool() { return bool(rand() & 1); }
 
-  // Returns an std::string of length size consisting only of characters allowed in the given mask
-  // using the constants LOWER, UPPER, DIGITS
-  // Example:
-  // Rand rand(argc, argv);
-  // std::string str = rand.String(10, LOWER | DIGITS); 
-  // str is an std::string of size 10 consisting only of lowercase letters and digits
+  // Returns an std::string of length size consisting only of characters allowed
+  // in the given mask using the constants LOWER, UPPER, DIGITS Example: Rand
+  // rand(argc, argv); std::string str = rand.String(10, LOWER | DIGITS); str is
+  // an std::string of size 10 consisting only of lowercase letters and digits
   std::string String(size_t size, const int mask = LOWER | UPPER) {
     std::string charset;
 
@@ -144,7 +158,7 @@ public:
     std::string res(size, ' ');
 
     int len = charset.size();
-    
+
     for (char& c : res) {
       size_t randomIndex = Int(0, len - 1);
       c = charset[randomIndex];
@@ -192,8 +206,9 @@ int main() {
 }
 `
 const JavaTemplate = `
-import java.util.*;
+
 import java.io.*;
+import java.util.*;
 
 /**
  * Made by egor https://github.com/chermehdi/egor.
@@ -202,17 +217,12 @@ import java.io.*;
  * {{end}}
  */
 public class Main {
-
-    void solve(Scanner in, PrintWriter out) {
-
-    }
-
-    public static void main(String[] args) {
-        try(Scanner in = new Scanner(System.in);
-            PrintWriter out = new PrintWriter(System.out)) {
-            new Main().solve(in, out);
-        }
+  void solve(Scanner in, PrintWriter out) {}
+  public static void main(String[] args) {
+    try (Scanner in = new Scanner(System.in); PrintWriter out = new PrintWriter(System.out)) {
+      new Main().solve(in, out);
     }
+  }
 }
 `