blob: 2492e7f2e4477938967f6bf0c4a737dca4d6334a [file] [log] [blame]
--- popt-1.18/src/popt.c.orig 2021-05-28 20:17:58.029422700 -0700
+++ popt-1.18/src/popt.c 2021-05-28 20:22:02.481420900 -0700
@@ -908,8 +908,13 @@
int poptSaveLongLong(long long * arg, unsigned int argInfo, long long aLongLong)
{
+#if 0
/* XXX Check alignment, may fail on funky platforms. */
if (arg == NULL || (((unsigned long)arg) & (ALIGNOF(*arg)-1)))
+#else
+ /* It does! pm@debian.org */
+ if (arg == NULL)
+#endif
return POPT_ERROR_NULLARG;
if (aLongLong != 0 && LF_ISSET(RANDOM)) {
@@ -949,8 +954,13 @@
int poptSaveLong(long * arg, unsigned int argInfo, long aLong)
{
+#if 0
/* XXX Check alignment, may fail on funky platforms. */
if (arg == NULL || (((unsigned long)arg) & (ALIGNOF(*arg)-1)))
+#else
+ /* It does! pm@debian.org */
+ if (arg == NULL)
+#endif
return POPT_ERROR_NULLARG;
if (aLong != 0 && LF_ISSET(RANDOM)) {
@@ -982,8 +992,13 @@
int poptSaveInt(int * arg, unsigned int argInfo, long aLong)
{
+#if 0
/* XXX Check alignment, may fail on funky platforms. */
if (arg == NULL || (((unsigned long)arg) & (ALIGNOF(*arg)-1)))
+#else
+ /* It does! pm@debian.org */
+ if (arg == NULL)
+#endif
return POPT_ERROR_NULLARG;
if (aLong != 0 && LF_ISSET(RANDOM)) {
@@ -1015,8 +1030,13 @@
int poptSaveShort(short * arg, unsigned int argInfo, long aLong)
{
+#if 0
/* XXX Check alignment, may fail on funky platforms. */
if (arg == NULL || (((unsigned long)arg) & (ALIGNOF(*arg)-1)))
+#else
+ /* It does! pm@debian.org */
+ if (arg == NULL)
+#endif
return POPT_ERROR_NULLARG;
if (aLong != 0 && LF_ISSET(RANDOM)) {