From: <n-...@us...> - 2013-09-26 13:20:25
|
Revision: 8673 http://gfarm.svn.sourceforge.net/gfarm/?rev=8673&view=rev Author: n-soda Date: 2013-09-26 13:20:16 +0000 (Thu, 26 Sep 2013) Log Message: ----------- merge r8660 from the 2.6 branch: fix potential out-of-range parameter for isdigit(). the range of *p may be -128 .. -2, if *p is signed char, and the C language standard doesn't allow such value. this problem was introduced in r8361 for #712 and #713. Revision Links: -------------- http://gfarm.svn.sourceforge.net/gfarm/?rev=8660&view=rev http://gfarm.svn.sourceforge.net/gfarm/?rev=8361&view=rev Modified Paths: -------------- gfarm_v2/trunk/gftool/gfncopy/gfncopy.c Property Changed: ---------------- gfarm_v2/trunk/ gfarm_v2/trunk/gftool/gfdump/ gfarm_v2/trunk/gftool/gfdump/gfdump.postgresql.in gfarm_v2/trunk/gftool/gfgroup/gfgroup.c gfarm_v2/trunk/lib/libgfarm/gfarm/ gfarm_v2/trunk/server/gfmd/ Property changes on: gfarm_v2/trunk ___________________________________________________________________ Modified: svn:mergeinfo - /gfarm_v2/branches/2.4:5271,5275-5281,5290,5329 /gfarm_v2/branches/2.5:5630-5631,5772,5803,5867,5951,5956,5958,5961-5962,5983-5984,5988,6008,6035,6038,6060,6112,6199,6201,6204,6207,6209-6210,6288,6298,6301,6312,6317,6319,6323,6325,6329,6344,6362,6368,6401,6404,6412,6415,6417,6422,6430,6480-6481,6489,6493-6494,6497,6502,6506,6510-6511,6515,6519,6521,6523,6534,6540,6547,6559,6583,6585,6587-6588,6590,6594,6602,6606,6610,6612-6613,6618,6627,6636-6637,6641,6649,6654,6659,6663-6664,6673,6675,6677,6680,6682,6684,6686,6688-6689,6703,6709,6713-6714,6716,6718-6719,6721-6726,6730,6744,6749,6752,6760,6787,6793,6802,6805,6817,6827-6828,6830-6831,6845-6850,6860,6862,6867,6871-6872,6874,6878,6882-6883,6886,6888,6894,6902,6904,6907,6915,6917-6918,6923-6925,6931,6933,6937,6940,6944,6947,6974,6979,6983,6987,6992,7001,7004,7009,7016-7017,7025,7028,7034,7043,7045-7047,7049,7051-7055,7057-7058,7062-7064,7067,7069,7072,7075-7077,7079-7081,7083-7084,7086,7092,7094-7095,7107-7110,7112,7149,7172,7182,7189,7216-7217,7509,7561,7564,7633,7650,7655,7680,7725,7728,7732,7736,7780,7796,7813,7852,7855,7897,7918,7922,7924,7929,7933,7941-7942,7954,7983,7997,8005,8008,8011,8014,8017,8028,8040,8043,8050,8053,8083,8095,8097,8149,8154,8163,8180-8181,8189,8227,8232,8236,8241,8245,8280,8310,8313,8333,8336,8339,8347,8413-8414,8417,8420,8423,8454,8505,8520,8533,8599,8605,8614,8669 /gfarm_v2/branches/2.5.7:6801,6804,6989,6998-6999 /gfarm_v2/branches/2.6:7207,7408,7511,7556,7558,7586,7590,7592,7603,7606,7637,7646-7647,7652,7657,7726,7729,7733,7737,7819,7925,7931,7943,7975,8006,8098,8102,8127,8156,8164,8182,8184,8190,8259,8282,8298,8311,8314,8351,8361,8363,8365,8367,8370,8372,8382,8384,8386-8387,8392,8415,8433,8455,8461,8534,8564,8572,8578,8584,8586-8587,8639,8642,8659 + /gfarm_v2/branches/2.4:5271,5275-5281,5290,5329 /gfarm_v2/branches/2.5:5630-5631,5772,5803,5867,5951,5956,5958,5961-5962,5983-5984,5988,6008,6035,6038,6060,6112,6199,6201,6204,6207,6209-6210,6288,6298,6301,6312,6317,6319,6323,6325,6329,6344,6362,6368,6401,6404,6412,6415,6417,6422,6430,6480-6481,6489,6493-6494,6497,6502,6506,6510-6511,6515,6519,6521,6523,6534,6540,6547,6559,6583,6585,6587-6588,6590,6594,6602,6606,6610,6612-6613,6618,6627,6636-6637,6641,6649,6654,6659,6663-6664,6673,6675,6677,6680,6682,6684,6686,6688-6689,6703,6709,6713-6714,6716,6718-6719,6721-6726,6730,6744,6749,6752,6760,6787,6793,6802,6805,6817,6827-6828,6830-6831,6845-6850,6860,6862,6867,6871-6872,6874,6878,6882-6883,6886,6888,6894,6902,6904,6907,6915,6917-6918,6923-6925,6931,6933,6937,6940,6944,6947,6974,6979,6983,6987,6992,7001,7004,7009,7016-7017,7025,7028,7034,7043,7045-7047,7049,7051-7055,7057-7058,7062-7064,7067,7069,7072,7075-7077,7079-7081,7083-7084,7086,7092,7094-7095,7107-7110,7112,7149,7172,7182,7189,7216-7217,7509,7561,7564,7633,7650,7655,7680,7725,7728,7732,7736,7780,7796,7813,7852,7855,7897,7918,7922,7924,7929,7933,7941-7942,7954,7983,7997,8005,8008,8011,8014,8017,8028,8040,8043,8050,8053,8083,8095,8097,8149,8154,8163,8180-8181,8189,8227,8232,8236,8241,8245,8280,8310,8313,8333,8336,8339,8347,8413-8414,8417,8420,8423,8454,8505,8520,8533,8599,8605,8614,8669 /gfarm_v2/branches/2.5.7:6801,6804,6989,6998-6999 /gfarm_v2/branches/2.6:7207,7408,7511,7556,7558,7586,7590,7592,7603,7606,7637,7646-7647,7652,7657,7726,7729,7733,7737,7819,7925,7931,7943,7975,8006,8098,8102,8127,8156,8164,8182,8184,8190,8259,8282,8298,8311,8314,8351,8361,8363,8365,8367,8370,8372,8382,8384,8386-8387,8392,8415,8433,8455,8461,8534,8564,8572,8578,8584,8586-8587,8639,8642,8659-8660 Property changes on: gfarm_v2/trunk/gftool/gfdump ___________________________________________________________________ Modified: svn:mergeinfo - /gfarm_v2/branches/2.5/gftool/gfdump:6480-6481,6521,6587,6618,6703,6713,6718,6721-6725,6730,6805,6817,6827-6828,6830-6831,6845-6850,6860,6862,6867,6871-6872,6874,6883,6888,6894,6902,6904,6907,6915,6917-6918,6923-6925,6931,6933,6940,6944,6947,6974,6979,6983,6987,6992,7001,7004,7009,7016-7017,7025,7028,7034,7043,7045-7047,7049,7051-7055,7057-7058,7062-7064,7067,7069,7072,7075-7077,7079-7081,7083-7084,7086,7092,7094-7095,7107-7110,7112,7149,7172,7182,7189,7216-7217,7509,7561,7564,7633,7650,7655,7680,7725,7728,7732,7736,7780,7796,7813,7852,7855,7897,7918,7922,7924,7929,7933,7941-7942,7983,7997,8005,8008,8011,8014,8017,8028,8040,8043,8050,8053,8083,8095,8097,8149,8154,8163,8180-8181,8189,8227,8232,8236,8241,8245,8280,8310,8313,8333,8336,8339,8347,8413-8414,8417,8420,8423,8454,8505,8520,8533,8599,8605,8614,8669 /gfarm_v2/branches/2.5.7/gftool/gfdump:6801,6804,6989,6998-6999 /gfarm_v2/branches/2.6/gftool/gfdump:7207,7408,7511,7556,7558,7586,7590,7592,7603,7606,7637,7646-7647,7652,7657,7726,7729,7733,7737,7819,7925,7931,7943,7975,8006,8098,8102,8127,8156,8164,8182,8184,8190,8259,8282,8298,8311,8314,8351,8361,8363,8365,8367,8370,8372,8382,8384,8386-8387,8392,8415,8433,8455,8461,8534,8564,8572,8578,8584,8586-8587,8639,8642,8659 + /gfarm_v2/branches/2.5/gftool/gfdump:6480-6481,6521,6587,6618,6703,6713,6718,6721-6725,6730,6805,6817,6827-6828,6830-6831,6845-6850,6860,6862,6867,6871-6872,6874,6883,6888,6894,6902,6904,6907,6915,6917-6918,6923-6925,6931,6933,6940,6944,6947,6974,6979,6983,6987,6992,7001,7004,7009,7016-7017,7025,7028,7034,7043,7045-7047,7049,7051-7055,7057-7058,7062-7064,7067,7069,7072,7075-7077,7079-7081,7083-7084,7086,7092,7094-7095,7107-7110,7112,7149,7172,7182,7189,7216-7217,7509,7561,7564,7633,7650,7655,7680,7725,7728,7732,7736,7780,7796,7813,7852,7855,7897,7918,7922,7924,7929,7933,7941-7942,7983,7997,8005,8008,8011,8014,8017,8028,8040,8043,8050,8053,8083,8095,8097,8149,8154,8163,8180-8181,8189,8227,8232,8236,8241,8245,8280,8310,8313,8333,8336,8339,8347,8413-8414,8417,8420,8423,8454,8505,8520,8533,8599,8605,8614,8669 /gfarm_v2/branches/2.5.7/gftool/gfdump:6801,6804,6989,6998-6999 /gfarm_v2/branches/2.6/gftool/gfdump:7207,7408,7511,7556,7558,7586,7590,7592,7603,7606,7637,7646-7647,7652,7657,7726,7729,7733,7737,7819,7925,7931,7943,7975,8006,8098,8102,8127,8156,8164,8182,8184,8190,8259,8282,8298,8311,8314,8351,8361,8363,8365,8367,8370,8372,8382,8384,8386-8387,8392,8415,8433,8455,8461,8534,8564,8572,8578,8584,8586-8587,8639,8642,8659-8660 Property changes on: gfarm_v2/trunk/gftool/gfdump/gfdump.postgresql.in ___________________________________________________________________ Modified: svn:mergeinfo - /gfarm_v2/branches/2.5/gftool/gfdump/gfdump.postgresql.in:6480-6481,6925,6940,7053-7055,7057-7058,7062-7064,7067,7072,7075-7076,7079-7080,7083,7094-7095,7107,7109-7110,7112,7149,7172,7182,7189,7216-7217,7509,7561,7564,7633,7650,7655,7680,7725,7728,7732,7736,7780,7796,7813,7852,7855,7897,7918,7922,7924,7929,7933,7941-7942,7983,7997,8005,8008,8011,8014,8017,8028,8040,8043,8050,8053,8083,8095,8097,8149,8154,8163,8180-8181,8189,8227,8232,8236,8241,8245,8280,8310,8313,8333,8336,8339,8347,8413-8414,8417,8420,8423,8454,8505,8520,8533,8599,8605,8614,8669 /gfarm_v2/branches/2.5.7/gftool/gfdump/gfdump.postgresql.in:6804,6989,6998-6999 /gfarm_v2/branches/2.6/gftool/gfdump/gfdump.postgresql.in:7207,7408,7511,7556,7558,7586,7590,7592,7603,7606,7637,7646-7647,7652,7657,7726,7729,7733,7737,7819,7925,7931,7943,7975,8006,8098,8102,8127,8156,8164,8182,8184,8190,8259,8282,8298,8311,8314,8351,8361,8363,8365,8367,8370,8372,8382,8384,8386-8387,8392,8415,8433,8455,8461,8534,8564,8572,8578,8584,8586-8587,8639,8642,8659 + /gfarm_v2/branches/2.5/gftool/gfdump/gfdump.postgresql.in:6480-6481,6925,6940,7053-7055,7057-7058,7062-7064,7067,7072,7075-7076,7079-7080,7083,7094-7095,7107,7109-7110,7112,7149,7172,7182,7189,7216-7217,7509,7561,7564,7633,7650,7655,7680,7725,7728,7732,7736,7780,7796,7813,7852,7855,7897,7918,7922,7924,7929,7933,7941-7942,7983,7997,8005,8008,8011,8014,8017,8028,8040,8043,8050,8053,8083,8095,8097,8149,8154,8163,8180-8181,8189,8227,8232,8236,8241,8245,8280,8310,8313,8333,8336,8339,8347,8413-8414,8417,8420,8423,8454,8505,8520,8533,8599,8605,8614,8669 /gfarm_v2/branches/2.5.7/gftool/gfdump/gfdump.postgresql.in:6804,6989,6998-6999 /gfarm_v2/branches/2.6/gftool/gfdump/gfdump.postgresql.in:7207,7408,7511,7556,7558,7586,7590,7592,7603,7606,7637,7646-7647,7652,7657,7726,7729,7733,7737,7819,7925,7931,7943,7975,8006,8098,8102,8127,8156,8164,8182,8184,8190,8259,8282,8298,8311,8314,8351,8361,8363,8365,8367,8370,8372,8382,8384,8386-8387,8392,8415,8433,8455,8461,8534,8564,8572,8578,8584,8586-8587,8639,8642,8659-8660 Property changes on: gfarm_v2/trunk/gftool/gfgroup/gfgroup.c ___________________________________________________________________ Modified: svn:mergeinfo - /gfarm_v2/branches/2.4/gftool/gfgroup/gfgroup.c:5271,5275-5281,5290,5329,5335 /gfarm_v2/branches/2.5/gftool/gfgroup/gfgroup.c:5630-5631,5772,5803,5867,5951,5956,5958,5962,5983-5984,5988,6008,6035,6038,6060,6112,6199,6201,6204,6207,6209-6210,6298,6301,6312,6317,6319,6323,6325,6329,6344,6362,6368,6401,6404,6412,6415,6417,6422,6430,6480-6481,6489,6493-6494,6502,6506,6510-6511,6515,6519,6521,6523,6547,6559,6583,6585,6587-6588,6590,6594,6602,6606,6610,6612,6618,6627,6636-6637,6641,6649,6654,6659,6663,6673,6675,6677,6680,6682,6684,6686,6688-6689,6703,6709,6713-6714,6716,6718-6719,6721-6726,6730,6744,6749,6752,6760,6787,6793,6802,6805,6817,6827-6828,6830-6831,6845-6850,6860,6862,6867,6871-6872,6874,6883,6888,6894,6902,6904,6907,6915,6917-6918,6923-6925,6931,6933,6940,6944,6947,6974,6979,6983,6987,6992,7001,7004,7009,7016-7017,7025,7028,7034,7043,7045-7047,7049,7051-7055,7057-7058,7062-7064,7067,7069,7072,7075-7077,7079-7081,7083-7084,7086,7092,7094-7095,7107-7110,7112,7149,7172,7182,7189,7216-7217,7509,7561,7564,7633,7650,7655,7680,7725,7728,7732,7736,7780,7796,7813,7852,7855,7897,7918,7922,7924,7929,7933,7941-7942,7983,7997,8005,8008,8011,8014,8017,8028,8040,8043,8050,8053,8083,8095,8097,8149,8154,8163,8180-8181,8189,8227,8232,8236,8241,8245,8280,8310,8313,8333,8336,8339,8347,8413-8414,8417,8420,8423,8454,8505,8520,8533,8599,8605,8614,8669 /gfarm_v2/branches/2.5.7/gftool/gfgroup/gfgroup.c:6801,6804,6989,6998-6999 /gfarm_v2/branches/2.6/gftool/gfgroup/gfgroup.c:7207,7408,7511,7556,7558,7586,7590,7592,7603,7606,7637,7646-7647,7652,7657,7726,7729,7733,7737,7819,7925,7931,7943,7975,8006,8098,8102,8127,8156,8164,8182,8184,8190,8259,8282,8298,8311,8314,8351,8361,8363,8365,8367,8370,8372,8382,8384,8386-8387,8392,8415,8433,8455,8461,8534,8564,8572,8578,8584,8586-8587,8639,8642,8659 + /gfarm_v2/branches/2.4/gftool/gfgroup/gfgroup.c:5271,5275-5281,5290,5329,5335 /gfarm_v2/branches/2.5/gftool/gfgroup/gfgroup.c:5630-5631,5772,5803,5867,5951,5956,5958,5962,5983-5984,5988,6008,6035,6038,6060,6112,6199,6201,6204,6207,6209-6210,6298,6301,6312,6317,6319,6323,6325,6329,6344,6362,6368,6401,6404,6412,6415,6417,6422,6430,6480-6481,6489,6493-6494,6502,6506,6510-6511,6515,6519,6521,6523,6547,6559,6583,6585,6587-6588,6590,6594,6602,6606,6610,6612,6618,6627,6636-6637,6641,6649,6654,6659,6663,6673,6675,6677,6680,6682,6684,6686,6688-6689,6703,6709,6713-6714,6716,6718-6719,6721-6726,6730,6744,6749,6752,6760,6787,6793,6802,6805,6817,6827-6828,6830-6831,6845-6850,6860,6862,6867,6871-6872,6874,6883,6888,6894,6902,6904,6907,6915,6917-6918,6923-6925,6931,6933,6940,6944,6947,6974,6979,6983,6987,6992,7001,7004,7009,7016-7017,7025,7028,7034,7043,7045-7047,7049,7051-7055,7057-7058,7062-7064,7067,7069,7072,7075-7077,7079-7081,7083-7084,7086,7092,7094-7095,7107-7110,7112,7149,7172,7182,7189,7216-7217,7509,7561,7564,7633,7650,7655,7680,7725,7728,7732,7736,7780,7796,7813,7852,7855,7897,7918,7922,7924,7929,7933,7941-7942,7983,7997,8005,8008,8011,8014,8017,8028,8040,8043,8050,8053,8083,8095,8097,8149,8154,8163,8180-8181,8189,8227,8232,8236,8241,8245,8280,8310,8313,8333,8336,8339,8347,8413-8414,8417,8420,8423,8454,8505,8520,8533,8599,8605,8614,8669 /gfarm_v2/branches/2.5.7/gftool/gfgroup/gfgroup.c:6801,6804,6989,6998-6999 /gfarm_v2/branches/2.6/gftool/gfgroup/gfgroup.c:7207,7408,7511,7556,7558,7586,7590,7592,7603,7606,7637,7646-7647,7652,7657,7726,7729,7733,7737,7819,7925,7931,7943,7975,8006,8098,8102,8127,8156,8164,8182,8184,8190,8259,8282,8298,8311,8314,8351,8361,8363,8365,8367,8370,8372,8382,8384,8386-8387,8392,8415,8433,8455,8461,8534,8564,8572,8578,8584,8586-8587,8639,8642,8659-8660 Modified: gfarm_v2/trunk/gftool/gfncopy/gfncopy.c =================================================================== --- gfarm_v2/trunk/gftool/gfncopy/gfncopy.c 2013-09-26 13:11:09 UTC (rev 8672) +++ gfarm_v2/trunk/gftool/gfncopy/gfncopy.c 2013-09-26 13:20:16 UTC (rev 8673) @@ -606,7 +606,7 @@ static int is_number(const char *str) { - const char *p = str; + const unsigned char *p = (unsigned char *)str; if (*p == '-') p++; @@ -618,7 +618,7 @@ static void translate_digit(char *out, int size, const char *in) { - const char *p = in; + const unsigned char *p = (unsigned char *)in; while (isblank(*p)) p++; Property changes on: gfarm_v2/trunk/lib/libgfarm/gfarm ___________________________________________________________________ Modified: svn:mergeinfo - /gfarm_v2/branches/2.5/lib/libgfarm/gfarm:8005,8008,8011,8014,8017,8028,8040,8043,8050,8053,8083,8095,8097,8149,8154,8163,8180-8181,8189,8227,8232,8236,8241,8245,8280,8310,8313,8333,8336,8339,8347,8413-8414,8417,8420,8423,8454,8505,8520,8533,8599,8605,8614,8669 /gfarm_v2/branches/2.6/lib/libgfarm/gfarm:8098,8102,8127,8156,8164,8182,8184,8190,8259,8282,8298,8311,8314,8351,8361,8363,8365,8367,8370,8372,8382,8384,8386-8387,8392,8415,8433,8455,8461,8534,8564,8572,8578,8584,8586-8587,8639,8642,8659 + /gfarm_v2/branches/2.5/lib/libgfarm/gfarm:8005,8008,8011,8014,8017,8028,8040,8043,8050,8053,8083,8095,8097,8149,8154,8163,8180-8181,8189,8227,8232,8236,8241,8245,8280,8310,8313,8333,8336,8339,8347,8413-8414,8417,8420,8423,8454,8505,8520,8533,8599,8605,8614,8669 /gfarm_v2/branches/2.6/lib/libgfarm/gfarm:8098,8102,8127,8156,8164,8182,8184,8190,8259,8282,8298,8311,8314,8351,8361,8363,8365,8367,8370,8372,8382,8384,8386-8387,8392,8415,8433,8455,8461,8534,8564,8572,8578,8584,8586-8587,8639,8642,8659-8660 Property changes on: gfarm_v2/trunk/server/gfmd ___________________________________________________________________ Modified: svn:mergeinfo - /gfarm_v2/branches/2.5/server/gfmd:8280,8310,8313,8333,8336,8339,8347,8413-8414,8417,8420,8423,8454,8505,8520,8533,8599,8605,8614,8669 /gfarm_v2/branches/2.6/server/gfmd:8298,8311,8314,8351,8361,8363,8365,8367,8370,8372,8382,8384,8386-8387,8392,8415,8433,8455,8461,8534,8564,8572,8578,8584,8586-8587,8639,8642,8659 + /gfarm_v2/branches/2.5/server/gfmd:8280,8310,8313,8333,8336,8339,8347,8413-8414,8417,8420,8423,8454,8505,8520,8533,8599,8605,8614,8669 /gfarm_v2/branches/2.6/server/gfmd:8298,8311,8314,8351,8361,8363,8365,8367,8370,8372,8382,8384,8386-8387,8392,8415,8433,8455,8461,8534,8564,8572,8578,8584,8586-8587,8639,8642,8659-8660 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |