From 26bea900a531662c6028ecc06f4adea825658434 Mon Sep 17 00:00:00 2001
From: Pawel Kowalski <p.kowalski2@partner.samsung.com>
Date: Wed, 28 Aug 2019 14:28:40 +0200
Subject: Imported Upstream version 4.14

---
 src/asn1Parser.c | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

(limited to 'src/asn1Parser.c')

diff --git a/src/asn1Parser.c b/src/asn1Parser.c
index 475bfc9..b6844a8 100644
--- a/src/asn1Parser.c
+++ b/src/asn1Parser.c
@@ -25,11 +25,11 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <getopt.h>
+#include <assert.h>
 
 #include <libtasn1.h>
 
-#include <progname.h>
-#include <version-etc.h>
+#define program_name "asn1Parser"
 
 /* This feature is available in gcc versions 2.5 and later.  */
 #if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)
@@ -58,7 +58,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\
   -n, --name=NAME       array name\n\
   -h, --help            display this help and exit\n\
   -v, --version         output version information and exit\n");
-      emit_bug_reporting_address ();
+     printf ("Report bugs to "PACKAGE_BUGREPORT);
     }
   exit (status);
 }
@@ -84,8 +84,6 @@ main (int argc, char *argv[])
   char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE];
   int parse_result = ASN1_SUCCESS;
 
-  set_program_name (argv[0]);
-
   opterr = 0;			/* disable error messages from getopt */
 
   while (1)
@@ -111,8 +109,9 @@ main (int argc, char *argv[])
 	  usage (EXIT_SUCCESS);
 	  break;
 	case 'v':		/* VERSION */
-	  version_etc (stdout, program_name, PACKAGE, VERSION,
-		       "Fabio Fiorina", NULL);
+	  printf(program_name" "PACKAGE" " VERSION"\n");
+	  printf("Copyright (C) 2017-2019 Free Software Foundation, Inc.\n\n");
+	  printf("Written by Fabio Fiorina\n");
 	  free (outputFileName);
 	  free (vectorName);
 	  exit (0);
@@ -121,12 +120,22 @@ main (int argc, char *argv[])
 	  checkSyntaxOnly = 1;
 	  break;
 	case 'o':		/* OUTPUT */
-	  outputFileName = (char *) malloc (strlen (optarg) + 1);
-	  strcpy (outputFileName, optarg);
+	  assert(optarg != NULL);
+	  outputFileName = strdup(optarg);
+	  if (outputFileName == NULL)
+	    {
+	      fprintf(stderr, "Memory error\n");
+	      exit(1);
+            }
 	  break;
 	case 'n':		/* VECTOR NAME */
-	  vectorName = (char *) malloc (strlen (optarg) + 1);
-	  strcpy (vectorName, optarg);
+	  assert(optarg != NULL);
+	  vectorName = strdup(optarg);
+	  if (vectorName == NULL)
+	    {
+	      fprintf(stderr, "Memory error\n");
+	      exit(1);
+            }
 	  break;
 	case '?':		/* UNKNOW OPTION */
 	  fprintf (stderr,
-- 
cgit v1.2.3